Merge changes from topic "mmtel_capability" am: 4b07c1b401 am: 6ab83e6216 am: 764e5d7fae

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

Change-Id: I5a5e41fed75e943a44a20a14cde5faad4de7b692