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

Change-Id: Icc899e3da0472a9409856e51d1bd8f02074431ad