Merge changes from topic "revert-1927643-mmtel_capability-TQUGHHKONR" am: c7dc6dc0da

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

Change-Id: I50abb56e28b40db770c2c32c74d1d255c9e9efc0