Merge "[Settings] Avoid from crash - SystemProp default null" into sc-qpr1-dev am: ebe477db21
am: e44708ea39
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15824485 Change-Id: I980b71340895bc44902c70c436bf2ac54ff28a5e
This commit is contained in: