[automerger skipped] Merge "[Settings] Enable access from non-UI thread" am:...

[automerger skipped] Merge "[Settings] Enable access from non-UI thread" am: 9ec200f8 am: 28e53517 -s ours am: b0e6b28c -s ours am: b770db49 -s ours am: 52e2324b -s ours

am skip reason: Change-Id I768f41f76d0223634be2b728d33fa0cfcc69fe69 with SHA-1 19507e75 is in history

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

Change-Id: I3f9e8d160f0ba493dd453a590cabb3b7e21ccbed