Merge "Fix KeyguardDisabledFeaturesActivity disable camera description" into oreo-mr1-cts-dev