Merge "SELinuxHostTest: Fix testValidServiceContexts()" am: 048d32aa56
am: ac83410459

* commit 'ac834104594507a705020b8d5e5ea11d128c6bdd':
  SELinuxHostTest: Fix testValidServiceContexts()