Merge "Revert "DO NOT MERGE Remove focus on PasswordTextView"" into rvc-qpr-dev am: 3c8e090455

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

Change-Id: I1ae8b92156ba5a4e9ff46e68f3ba069b88e8f1ed