[automerger skipped] Merge changes from topics "provisioning improvement", "provisioning_improvement_2" am: 3e5127460d am: 1c8dc6e479 am: 79fb01bca1 am: 468efa4b6d -s ours

am skip reason: Merged-In I907a32474a68af51e182169f146ad2fc957e5f8d with SHA-1 80ba52f579 is already in history

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

Change-Id: If9413cd772ef7952d3b2d2665b7f210b87218d68