Merge "Merge "Un-obscure the Telephony phone account ID." into tm-dev am:...

Merge "Merge "Un-obscure the Telephony phone account ID." into tm-dev am: 3ff037cb am: 3c4093be" into tm-d1-dev-plus-aosp am: 84c6233d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18203217



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