Merge "Fixed that the camera will not be blocked on the virtual display in...

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: Ib22e05f5e64dbbd9e58da287947c67e1d23db8f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>