[automerger skipped] DO NOT MERGE: Fixed an issue about notification icons on AOD am: d34e9d889a am: 2a3b0f1a28 -s ours
am: 97c48724a3 -s ours
am skip reason: subject contains skip directive

Change-Id: I3a9ae31570005853b4257ea151edcbc0c92c0584