Merge changes from topic "provisioning keys" into tm-mainline-prod am: 4bed8830b1

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

Change-Id: If94ab10620950d24a6dd500e91ff6306fff52b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>