[automerger skipped] Merge changes from topic "revert-1927643-mmtel_capability-TQUGHHKONR" am: c7dc6dc0 am: 60d94a4c am: 5905fa1d am: 08e521f0 -s ours

am skip reason: Merged-In I837606d9e91339c66f2e2cff1a3a76d1029750c6 with SHA-1 69af7793 is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1927642

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

Change-Id: I0d1adad62ceddb339e986ca6be411b4900b19df9