[automerger skipped] Merge changes from topic "redo_ims_poll" am: 80478ea7...

[automerger skipped] Merge changes from topic "redo_ims_poll" am: 80478ea7 am: 4a71cada am: 345ad693 am: fe256cfd -s ours

am skip reason: Change-Id Idc56628ea7b6cf705ce55d163ea29e5807a2515c with SHA-1 512858e1 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/1449456

Change-Id: Iaa758f1192ff91411a667b034bf221da4d85ba76