[automerger skipped] DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked am: bdf71a0420 am: 1b9f1ad3d8 -s ours am: 89dee3699e -s ours
am: 347e96ddf8 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifd9a0604d526c1f025ffe92415b2fa970ab3c7b6