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