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

[automerger skipped] Merge changes from topic "redo_ims_poll" am: ec6681c9 am: 58e629fd am: 82a16c79 am: 9893f166 -s ours

am skip reason: Change-Id I2e986fb2a1086043a25b11c71c005481cea74196 with SHA-1 bb53df9d is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449280

Change-Id: Id5aaa489b5dd3117a72adb95f20ce380ec44eb8d