[automerger skipped] Merge "Fix KeyguardDisabledFeaturesActivity disable camera description" into oreo-cts-dev
am: 45e2f9f2bc  -s ours

Change-Id: I58324e2e8d7ca2773d50d1b000fbc5f825d7fcd8