Merge "Fix KeyguardDisabledFeaturesActivity disable camera description" into oreo-cts-dev am: 45e2f9f2bc
am: 4a14024a9d

Change-Id: I6c806d630e59f1fb77372d0692b11071b349f693