Merge "Merge "Add new system level APIs for accessing IMS state" am: d3e3fab996 am: 2c84b6ec4b" into qt-qpr1-dev-plus-aosp