Merge "Rethrow exception in LockPatternUtils#registerStrongAuthTracker" into main