[2/2] Settings: Option to hide Adb notification icon

Change-Id: I6ec6ce2980db884a6eda4f3ca984b1fba71d8185
Merge remote-tracking branch 'upstream/android-5.0' into android-5.0
Omni sync