[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 skip reason: change_id I8f7bd7a6a0562942ed3e12f28705043722d177e8 with SHA165c96f2fd4is in history Change-Id: I12c9c9bc3adeba295431fb1335df5c6512ec08f9
This commit is contained in: