Merge "Add ambient notifications as inline setting." into oc-dr1-dev am: 3bd56d970d am: 3b30cbee7d -s ours
am: 280e3cc0d7 -s ours
Change-Id: I2b8de97f515eeb8e3c8a4919482fd1700262c13c
This commit is contained in: