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

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

Change-Id: I10e60023c1539abd8ac25ea8ed66ef53e06eee41