Merge "Make the new setSecondaryLockscreen a SystemApi" into main