Merge "Un-obscure the Telephony phone account ID." into tm-dev am: fc9fdfe2 am: 837d12a2 am: 6d702872 am: ad0992d2

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



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