[automerger skipped] Merge "Expose MmTelCapabilities#isCapable() as Public API" am: 784c6a8db2 am: f3fa23f787 am: 7e8cbfe8ed am: a74f8f021a -s ours
am skip reason: Change-Id I0a0d72897112460370e6981ae33cef4da6e3ce4b with SHA-1 21157d56a9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1314566
Change-Id: Ic744701b6bf231ce4cb7264605c308a9cf0fb222
This commit is contained in: