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 am: 1ba93416

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



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