[automerger skipped] Merge changes Ia8ce6cfa,I1acdfb09 into sc-qpr1-dev am:...

[automerger skipped] Merge changes Ia8ce6cfa,I1acdfb09 into sc-qpr1-dev am: 8c5611a7 am: 5d3e33ba am: b4ebc1c0 -s ours

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

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

Change-Id: I0478565b113a5b6417eb40a6e2209acfb43d6f9a