[automerger skipped] Merge "Fix Settings crash issue" into sc-qpr1-dev am: fae29c6b33
am: a0c8d6d6aa
am: c15f3731c9
-s ours
am skip reason: Merged-In I506ee81985158b8992529440a31d2d5cfe81f441 with SHA-1 1caaf7447d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15605528
Change-Id: I9805748bfd1eb4da6232a42090a01bccefde46c7
This commit is contained in: