Merge "Revert line introduced in previous CL that seems to always pass `false` for `onTrustManagedChanged`" into main