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

Merge "Merge "Revert "Un-obscure the Telephony phone account ID."" into tm-dev am: ec77a90a am: ef98914f am: 280f3108" into tm-qpr-dev-plus-aosp am: cbe738cd

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



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