Merge "Add secure settings for Ambient Display pick up and double tap gestures." into nyc-mr1-dev