[automerger skipped] Merge changes Ia99a4cf4,Ib31e23b8 am: 19113600 am:...

[automerger skipped] Merge changes Ia99a4cf4,Ib31e23b8 am: 19113600 am: d5ff766e am: 1cb02f5e -s ours

am skip reason: Change-Id Ia99a4cf4618fcb32162485e7da5e48e3b313ce67 with SHA-1 216b3464 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec2ac0ac303394d15d5540c6050ea9ecc989e3ff