Merge "ADB security logging"
am: 8dfe21eaad

* commit '8dfe21eaad739d297b34dbb1d2b9851d64a42dda':
  ADB security logging