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