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

Change-Id: I8c17429ce2b79a3e14e7b6cbabf7b377ace44718