[automerger skipped] Merge "Implement new IMS registration state and transport type query APIs" am: 99a92f6c18 am: 80acdf44fe
am: 183cfc7d81 -s ours
am skip reason: change_id I25f10714ac94c4488f108c2c7346a0ceee18ad8a with SHA1 a34a6c2f8c is in history

Change-Id: Ice93f9af1c42f92a5e29a83f3aeb2838a82a14fe