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

am skip reason: subject contains skip directive

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

Change-Id: Id6218865dc3130e39173afca845ffdb10853d443