[automerger skipped] Merge "Adds new Public ImsManager API" am: a993f6d76f
am: e80316e494  -s ours

Change-Id: I125594a58920184f9200a12c84f9ef08ac06bcf7