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

Change-Id: If5f07f768d7519a94c81a44e61838fe3d3a4b7fe