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