Merge "Add secure settings for Ambient Display pick up and double tap gestures." into nyc-mr1-dev am: b4b96040e0
am: 5452f047a8
Change-Id: Icf53300cfb7cca86f6c1a9c257eb777aacc0c368
This commit is contained in: