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

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

Change-Id: Id948a9453139cbf4e9afc75647152bdbd24cfe0a