Merge "logd: stop log spam when integrity enforcement is suppressed" am: 9218477ae7
am: 892cda4397

* commit '892cda439712bc40dd7cab2b19e6ac92b7461a22':
  logd: stop log spam when integrity enforcement is suppressed