[automerger skipped] Merge "[Settings] Enable access from non-UI thread" am: 9ec200f85c
am: 28e5351779
-s ours am: b0e6b28c4b
-s ours am: b770db49d9
-s ours
am skip reason: Change-Id I768f41f76d0223634be2b728d33fa0cfcc69fe69 with SHA-1 19507e7585
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390817
Change-Id: Ib9a383b64c4f02ab103aa246f655fc9f7499319f
This commit is contained in: