[automerger skipped] Merge changes Ia8ce6cfa,I1acdfb09 into sc-qpr1-dev am: 8c5611a7ea am: 3d7b3abff5 -s ours am: 5c8a325f23 -s ours

am skip reason: Merged-In Ia8ce6cfa19cd5d57695dc0092b1585d8cad5a8d7 with SHA-1 3043c87f98 is already in history

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

Change-Id: I41244d873d0b5e894b03fd04e2c3b4b2d42a9e28