[automerger skipped] Merge "[Settings] Avoid from EUICC access blocking main thread" am: bb750ad2d7
am: 7b7b900fa3
-s ours am: 5b01d70d8c
-s ours
am skip reason: Change-Id Ic1a2bd948b69d40632555d293df6ed56a6b7a712 with SHA-1 23ed0b2c34
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391158
Change-Id: Ibc36bfff1566749ec274e2a7cf3d8bdca8e39d2a
This commit is contained in: