Merge changes from topics "provisioning improvement", "provisioning_improvement_2" am: 3e5127460d

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1956970

Change-Id: I384f88cf03353aa6f1fc03c34f7ac65e9a320089