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

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



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