Merge "[MediaProjection] Handle null DisplayContent when trying to set the...

Merge "[MediaProjection] Handle null DisplayContent when trying to set the session" into udc-dev am: 9a50b8ad am: 1d46aedb am: 391d4c3a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23201202



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