Merge "Disable RedactedNotificationKeyguardDisabledFeaturesActivity for Android Wear" into nougat-mr1-cts-dev am: 6e5c428f10 am: c697937617 am: 50e4fc803f am: e1d1fffc21
am: ca0609f4ec

Change-Id: I3f35ebdac2f0dc6dbf773f1ceecfb23a4a4bee5b