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

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

Change-Id: If7b902a414a9dc88fea2d8269747015d57ec28f5