Merge "logd: stop log spam when integrity enforcement is suppressed" into nyc-dev
am: 78d2766143

* commit '78d2766143fd0479180f99a1ea5e959c7fb68f45':
  logd: stop log spam when integrity enforcement is suppressed