Merge "Hide camera affordance when secure Camera is disabled" into main am: 6e51daa4 am: 20848e47 am: 5e8cda1e

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



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