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