Merge "Merge "Clear notification count to handle different flows" into oc-dev am: fae2852b2b am: d50d573be9" into oc-dr1-dev-plus-aosp