Merge "Fixed camera streaming not being blocked when user taps camera on...

Merge "Fixed camera streaming not being blocked when user taps camera on personal streaming apps" into tm-qpr-dev am: a4ae390f am: 4121435d

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



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