Merge "Fixed an issue where notifications were invisible on AOD" into pi-dev
am: d4115f501d

Change-Id: I9dfa218bc30003581e8488d7b9d72bb192a19547