Merge changes from topic "redo_ims_poll" am: ec6681c927 am: 58e629fd68

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

Change-Id: I74f5803c1bc875aa5b22de4e24e0b140d258cd70