Merge "Improved ServicePermissionsTest so it shows all failures." into pie-cts-dev am: f476c604e0 am: 2f99a94049 am: 8b68566fef am: 738085dcc1 am: e790c55bfb
am: 75bbe862b7

Change-Id: Ibcc9e47ffc3c5bc376f9c34492a24e2a83c7efda