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

Change-Id: I6331f175aa3cf00c77b20e244acb99cc06d7ad09