[automerger skipped] Merge changes Ia8ce6cfa,I1acdfb09 into sc-qpr1-dev am: 8c5611a7ea
am: 3d7b3abff5
-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: I2ee0110135bc002a5521a560fb2f8d26c50a8811
This commit is contained in: