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

Change-Id: I6b68fa4875a9eddc3071c4f0199c1d1f085546aa