Merge "Implement ImsManager API for Telephony and update testapps" into pi-dev-plus-aosp