Hide ADB icon 1/2

Change-Id: I70150a9ab03eb24d9fcfb3c2ff6ee67c72341777
Merge "Hide ADB icon 1/2" into jb42