Bring in the new icon when it's done.
This does the following:
Revert "base: cm-iy adb notification icon"
This reverts commit 7256aa19.
Revert "base: update cid adb icon (again)"
This reverts commit 75ac0786.
Change-Id: I342f0bb6a6428de8c21e27588bbacf1566304026
