Merge "logd: test: logd.sepolicy* errors" am: ebc87c98e3 am: d7acf56639
am: ef3ee4008f

Change-Id: Iac8023896bb6f26f36965f44ef0ec899ec604271