Merge "Fix ANR of SimSlotChangeService" into udc-dev am: d758fe853b
am: 9a96e14cc2
am: e2869f34fa
am: 4edb135481
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083797 Change-Id: I2c9f8b36741a3130cf075670974843d97a8f74a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: