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