Merge "Camera quick affordance respects device policy." into tm-qpr-dev am:...

Merge "Camera quick affordance respects device policy." into tm-qpr-dev am: 0d74676c am: c5bad739

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



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