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

Change-Id: I9a082d481c0b277f0c9ce8e79d16edd7c4b08a1a