Merge changes from topic "redo_ims_poll" am: ec6681c927

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

Change-Id: I0972e8db35cc51932578fa8e9e785466352d203a