Automatic merge from submit-queue

Stop 'kubectl drain' deleting pods with local storage.

Kubectl drain will not continue if there are pods with local storage unless
forced with --delete-local-data.

Fixes #23972