[automerger skipped] Merge changes Idadf8487,I84d87024 am: e489d46b7c
am: 43b7ae19fb
am: a93434b11e
-s ours
am skip reason: Merged-In Idadf84873c88155382c48bb9108cf28d88aaef0a with SHA-1 4a5c128624
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1981855
Change-Id: I66d9d54d41213e6409d5cd5fef1025c199674e6e
This commit is contained in: