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: 78a97c8d

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



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