[automerger skipped] Revert "DO NOT MERGE Remove focus on PasswordTextView" am: 44c4a7496e am: 6a2a673152 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14040171

Change-Id: I9b67a3930605252c058c990b644489e6f13d602e