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: c56b3035" into tm-d1-dev-plus-aosp am: 1f9ecbd5

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



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