Merge "Support dynamically update IMSI" am: 5d2e89e03d am: 9b8855c018

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418348

Change-Id: Ic369f77eb09979e8ed36e4207fe42f293548ba90