Merge "sepolicy: Improve treble test error message." am: f1f1b4f063
am: c57a0ef2c7

Change-Id: I4365b0993f73d685dc15801784ed15781c08df8f