[automerger skipped] Merge changes I0ea498d2,I2d650eb3,I8adcf27e into...

[automerger skipped] Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev am: 671c6523 am: 303c6f3c -s ours

am skip reason: Merged-In I0ea498d2fa191f9b9352b37500a5d2c348b36ce0 with SHA-1 f71b2ea5 is already in history

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



Change-Id: Ic3f98ad45cbd9236e8287c0cf07cff507033a667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>