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

am skip reason: subject contains skip directive

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

Change-Id: I058acc80096bc29aef93c15ffd021960efdee6eb