Merge "Support dynamically update IMSI" am: 05e92bb5ef am: 3fd314dbca

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

Change-Id: Ic369f77eb09979e8ed36e4207fe42f293548ba90
tree: a15893a5594a002c1e89be28cdea85965a945124
  1. core/
  2. packages/
  3. services/
  4. wifi/