Merge "Merge "Add imsCall#getCallSession() null check in...

Merge "Merge "Add imsCall#getCallSession() null check in ImsPhoneCallTracker#maybeSetVideoCallProvider." into tm-dev am: 36e8e033 am: db98f1ab" into tm-d1-dev-plus-aosp am: 1334c484 am: d9cd76b2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/18629534



Change-Id: If84616f8c7f0712b1ad308a02bd81bdb5aee0dc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>