[automerger skipped] Merge "Revert "DO NOT MERGE Remove focus on...

[automerger skipped] Merge "Revert "DO NOT MERGE Remove focus on PasswordTextView"" into rvc-qpr-dev am: 3c8e0904 am: 7b8bf16a -s ours

am skip reason: subject contains skip directive

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

Change-Id: I099a0038537c7b306042cc51605a5d69b4bc2c1a