[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: 70f6e52b -s ours am: 281d5a98 -s ours am: 9b0a25cb -s ours

am skip reason: Change-Id Iad9c0d8b68557ff0d2d4acdf1ed0eb1ac7ee56df with SHA-1 767bc777 is in history

Change-Id: Ic1172f239eaf22f18b4441f0277eb424deabe647