Merge "Revert "Un-obscure the Telephony phone account ID."" into tm-dev am: ec77a90a am: ef98914f am: 1185e831

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



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