Merge "Expose ImsExternalCallState constructor as @SystemApi" am: 4133a00a10 am: 8e5a756f9d
am: aa2e73d8a5

Change-Id: I12e15589ed079a100efd3a872eb60193951b4efa