Merge "Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am: 295dd7193e am: 0151c6886f" into oc-dr1-dev-plus-aosp
am: 0b28195727

Change-Id: I290639670e15542bb073b836e249692014cdd6c8