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: 82e9a3d2" into rvc-d1-dev-plus-aosp am: a8176f3f am: 8e930968

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

Change-Id: I7f728aef14f70feadfd527d95bbfaf186689a005