[automerger skipped] Merge "Implement ImsManager API for Telephony and update testapps" into pi-dev-plus-aosp
am: 9119b1de4b  -s ours

Change-Id: Ic40b22a00975f9434681750f6ad7063139f036c3