[automerger skipped] DO NOT MERGE: Fixed an issue about notification icons on AOD am: d34e9d889a
am: 2a3b0f1a28 -s ours
am skip reason: change_id Ia64238f30620d9906aa50c2469121c2653875e8d with SHA1 5dc581aef2 is in history

Change-Id: I1f5cd435ea6097db0f57bed8aec780e195420565