tree e0440cf8aa41bae67a5be95624c279d6ce95a4b0
parent c8de979930ab3c140211ed99bc0b35398bb586ff
parent 08e521f02df2a62a2c4dccf5676cdb4efc8691a6
author Martijn Coenen <maco@google.com> 1640089835 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1640089835 +0000

[automerger skipped] Merge changes from topic "revert-1927643-mmtel_capability-TQUGHHKONR" am: c7dc6dc0da am: 60d94a4ce6 am: 5905fa1d55 am: 08e521f02d -s ours

am skip reason: Merged-In I837606d9e91339c66f2e2cff1a3a76d1029750c6 with SHA-1 69af77931e 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