[automerger skipped] Merge "Adds new Public ImsManager API" into pi-dev-plus-aosp
am: fe499bc0fb  -s ours

Change-Id: I3b169b1500f5fba51f0b7b8992919afa307ba5a3