[automerger skipped] Merge "Revert "Clean up IMS based interfaces to use a...

[automerger skipped] Merge "Revert "Clean up IMS based interfaces to use a push model instea..."" am: 8827badd am: 9a8e4bf6 am: a6bc5361 am: 9123ff8c am: bcbad4f6 -s ours

am skip reason: Change-Id I7ef3c07021a79e809d2c8b30ed2422372eae962d with SHA-1 91f87bfb is in history

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

Change-Id: I11b30891e189b75ea8b79834e78c53f4ec9dd190