[automerger skipped] Merge "Fix Settings crash issue" into sc-qpr1-dev am:...

[automerger skipped] Merge "Fix Settings crash issue" into sc-qpr1-dev am: fae29c6b am: a0c8d6d6 am: c15f3731 -s ours

am skip reason: Merged-In I506ee81985158b8992529440a31d2d5cfe81f441 with SHA-1 1caaf744 is already in history

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

Change-Id: I9805748bfd1eb4da6232a42090a01bccefde46c7