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

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

Change-Id: I3734b41d46f3c2da5be20d750a9e56b2b0c13cf5