[automerger skipped] Merge changes from topic "redo_ims_poll" am: 859329a1...

[automerger skipped] Merge changes from topic "redo_ims_poll" am: 859329a1 am: 3890cf47 am: 3e521f37 am: 78cbe3ce -s ours

am skip reason: Change-Id Ie393ae6610ebfbd4c939faec7fd8aaf96cbf6683 with SHA-1 bc465c9c is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1449477

Change-Id: Id62f9c6ab8f9290b89c041fd56c571fea3570d3f