Merge "Hide camera affordance when secure Camera is disabled" into main am: 6e51daa476

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

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