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

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



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