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

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

Change-Id: Ia07d4ea676a783c0f15d3cb4e5fe839cf27c3365