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

Change-Id: Iba7bb53b2aea94886de986e52b97697c25503f97