Merge "Revert "Move IMS to a listener type model instead of a poll model"" am: 0ad2adeb48

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1443077

Change-Id: I923b319cfce4d30df9f882d7d43184411ce7ad83