Merge "Add ambient notifications as inline setting." into oc-dr1-dev am: 3bd56d970d -s ours
am: 97ca7e473a -s ours
Change-Id: I083ead6fff77b2b319d6c13b9ff95d2679149c2b
This commit is contained in: