Merge "[Settings] Avoid from crash - SystemProp default null" into sc-qpr1-dev am: ebe477db21

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15824485

Change-Id: I38e52004ee7a1f5bf794f167d835e32c08ecb90c