Merge changes from topic "redo_ims_poll" am: af7c365e22 am: 7df60b3a54 am: 294b7fd65e

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

Change-Id: I5a2eddeb6b106fe3adbfb67f1a077a07df6ee615