Merge "Merge "Remove password shards from memory" into rvc-dev am: 01bd0fca...

Merge "Merge "Remove password shards from memory" into rvc-dev am: 01bd0fca am: 087ec344 am: 867adf2a" into rvc-qpr-dev-plus-aosp am: 619da0e5

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

Change-Id: I826b6d23be4cc22606966a258ab05c96e3e5cc7c