Merge "AOD: Fix launching notifications from occluded AOD" into oc-dr1-dev am: 9f3bac52ee am: 0870da759f
am: 0fabec8051

Change-Id: I4b47e1cf3ccad23702b952beb35b085292b27f6d