Merge "Implement new IMS registration state and transport type query APIs" am: 99a92f6c18
am: 80acdf44fe

Change-Id: I50cc9d18a8b3ae6e25e576b5141bbbe60faf88d1