[automerger skipped] Merge "Adds new Public ImsManager API" am: a993f6d76f am: e80316e494 -s ours
am: 1396c08660 -s ours
Change-Id: I8a05b53f80bad19521d0d046c6f965b374fb54ea
This commit is contained in: