Merge "Password settings: Fix duplicate title" into sc-dev am: d8cd67b5 am: e19759b6 am: bb0b80c5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15147962

Change-Id: I1df10d0cc275d279e7e4ac21ecf6ad9050c93f2a