[automerger skipped] Merge "Fix issue where inprogress self-managed call is...
[automerger skipped] Merge "Fix issue where inprogress self-managed call is not seen by car mode ui." am: 112599dd am: c885982f -s ours
am skip reason: Change-Id Iad9c0d8b68557ff0d2d4acdf1ed0eb1ac7ee56df with SHA-1 767bc777 is in history
Change-Id: Ibfbadb7e95edfcbfc2e0897f0c79cc5d08de8640