Merge "Fix password toggle taking FOCUS_DOWN events" into nyc-support-25.1-dev am: 9250be9b44
am: a31852d5bc

Change-Id: I915d87d836ff8ffea03778b4b2981ec32cadb82a