DO NOT MERGE: Fixed an issue about notification icons on AOD
am: d34e9d889a

Change-Id: If02cf694d7b93b509dcb728e1496690747e1b4c9