[automerger skipped] Merge "Moved telephony related resource to a separate file" am: d58f16c645 am: 8f417c8c2e -s ours am: eff6d6a85f -s ours
am skip reason: Merged-In Iebbee458035538f47ebd82fb7b9ba5fcf74d33db with SHA-1 7380604407 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2083848
Change-Id: I15f9f99d35d823a9557baf14b5ce84c5d3518c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: