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

Change-Id: Id2941edf0fb1f5fbcd610e44d99191ef8d55545d