Merge "Clean up IMS based interfaces to use a push model instead of poll" am: aea9e7c143 am: a4f7362b23

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

Change-Id: Ie394c55cde8fdd3b6adf7251d27832f4e0cdcb90