Merge "Fix traceEnd call for KeyAttestationApplicationIdProviderService phase in System Server."