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

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

Change-Id: I8bc7f5a2c6c42b85991b7a1d277cc34ba857687f