Merge "Adds @hide ImsService APIs" am: 2b879016d3 am: f46aa6f9ee
am: c9c8b590c5  -s ours

Change-Id: Iedc914d5b822f5f1d9a7a1404016e74731f9dd5a