Merge "Cache ITelephony service." am: 06d8ceab23 am: 377c221e0b

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

Change-Id: I25cf01398afc274b271691b15907393d57d49d6f