Merge changes from topics "provisioning improvement", "provisioning_improvement_2" am: 3e5127460d am: 1c8dc6e479 am: 79fb01bca1

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

Change-Id: Ic466c8f08a13557858d6f98fb89e0a4db15f9083