Merge "Implement ImsManager API for Telephony and update testapps"
am: 065d61b1ca

Change-Id: Id3652d2dceeea7feed82ae1e448419b4e62dae01