Merge "Demoting unstable transitioningToUnlocked_resetCallsPendingRunnable from presubmit" into main