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

Change-Id: I26a9c95a6de441d901f41fdd520d08d178e73d9f