Merge "Revert "Clean up IMS based interfaces to use a push model instea..."" am: 8827badd30

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

Change-Id: Ibd5354d59392f707b423d8cbd0522191dcb01c32