[automerger skipped] Merge "Cache ITelephony service." am: 06d8ceab23 am: 377c221e0b am: c03ef6facb am: 0edf5089be -s ours
am skip reason: Change-Id Icc3e9db5901655eb1102d5b7be81c26a685aa20d with SHA-1 78f5a82f9d is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1485138
Change-Id: Ia8f22c11edba8fa60f8cf8a6653df8c407fe71fb
This commit is contained in: