Merge "Clean up fully rolled out HeadlessDeviceOwnerDelegateSecurityLoggingBugFix" into main