[automerger skipped] Merge changes I89162011,I110727b6,I1778832b am:...

[automerger skipped] Merge changes I89162011,I110727b6,I1778832b am: cbc2c4f1 am: fa58b7e2 am: a0a079ed -s ours

am skip reason: Change-Id I891620118f7e84aa1c7f9e0ccdaeb21a225dc31a with SHA-1 e18207b9 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86a1cd6731be7b0687cd5b0c1ce572c78e90a442