Merge "Split Ambient Display settings." into nyc-mr1-dev am: 4f8a703d51
am: f79a9b397e
am: 799388df91
Change-Id: I3368cd81b3c7badf2b1acf5eb0b293c1412b8687
This commit is contained in: