[automerger skipped] Merge changes...

[automerger skipped] Merge changes I094ba6be,Idbdd21a1,I03dfdc25,I40afabb0,I01e0ec91, ... am: 8f91ac3e am: 0a69b346 am: ff1ebb31 am: afa860da -s ours

am skip reason: Merged-In I094ba6beb66fdebd7f3ef0a7c12bbed0e5b870e8 with SHA-1 fa0aec49 is already in history

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

Change-Id: Ib67c1dad9fbe0ca14506c19bc1c2d0b8e3f45074