Merge "Fixed that the camera will not be blocked on the virtual display in special cases" into tm-dev am: ab0c6673

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



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