[automerger skipped] Merge "Merge "Add new system level APIs for accessing IMS state" am: d3e3fab996 am: 2c84b6ec4b" into qt-qpr1-dev-plus-aosp
am: d930d364fb -s ours
am skip reason: change_id I17cbad4642ad3099668a354bb2588f2b55602311 with SHA1 6ac8e71164 is in history

Change-Id: I9d538ef746b62fc02d25b126b54c41cc9e51a513