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: 9be08609

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



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