Merge "Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am: 295dd719 am: 3158673e" into oc-dr1-dev-plus-aosp