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

Change-Id: Iffbd44676b0c4157b040b215d35a5359c6acc509