Merge "Add secure settings for Ambient Display pick up and double tap...
Merge "Add secure settings for Ambient Display pick up and double tap gestures." into nyc-mr1-dev am: b4b96040 am: 5452f047
am: 9140db19
Change-Id: I15c2dc34b73103f9879af6ff75edc6bff58f2363