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

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



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