Merge "Moved telephony related resource to a separate file" into tm-dev am:...

Merge "Moved telephony related resource to a separate file" into tm-dev am: 5b88e9fc am: 7f1a0043

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



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