deb: Disable diag device in normal mode.

Remove the diag device when the device is in normal mode.

Bug: 18203257
Change-Id: I79b3106f1ab0249459d8045b86cf63e227bf5c8c
merge in lmp-release history after reset to lmp-dev
merge in lmp-release history after reset to lmp-dev
Merge remote-tracking branch 'aosp/lollipop-release' into darkkat-5.0.0