Merge changes from topic "redo_ims_poll" am: af7c365e22

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

Change-Id: I829b9d87cbe8c2f5b65ef444a9b28e30179f573d