Merge "Improved ServicePermissionsTest so it shows all failures." am: 4731be31c7 am: f155ed0c37
am: 3bd369c3ad

Change-Id: I16402a8f974c9e924ec6c21def23997ba0511883