Merge "ADB security logging" am: 8dfe21eaad
am: e37103a375

* commit 'e37103a375de00d0300b49d2af3550db663f2f2e':
  ADB security logging