Merge "Merge "Revert "Un-obscure the Telephony phone account ID."" into tm-dev am: ec77a90abc am: c56b303524" into tm-d1-dev-plus-aosp am: 1f9ecbd5d9
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>
This commit is contained in: