tree 3549e722d252c6e98b0ad3232cdfc3548d1eb1a1
parent e10b319df6368a3833c0fdb942d1773ba7e87d13
parent 9119b1de4b146dff525e2136107fd49ab71fc559
author Brad Ebinger <breadley@google.com> 1540315119 -0700
committer android-build-merger <android-build-merger@google.com> 1540315119 -0700

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

Change-Id: Ic40b22a00975f9434681750f6ad7063139f036c3