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 am: 700e2597

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



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