[automerger skipped] Merge "Support query of IMS registrations status and...
[automerger skipped] Merge "Support query of IMS registrations status and transport type" am: 7bc44233 am: f5d75988
am: 51270a12 -s ours
am skip reason: change_id Ief3c75613bd889bad3b811fec0372422a6abf586 with SHA1 38b15601 is in history
Change-Id: I4ce9476604141f8cdc834c7214a080999b9c4fc6