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 am: b553c92a

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



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