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

Change-Id: I109e33ef0957c2e0e41ec02a9405daf6f83cf856