am 76e6bcb8: Merge "Fix issue #10310128: CTS: android.security.cts.ServicePermissionsTest" into klp-dev

* commit '76e6bcb8c6f8804c6e32d359ee464e7f288291a4':
  Fix issue #10310128: CTS: android.security.cts.ServicePermissionsTest