Merge "Remove password shards from memory" into rvc-dev am: 01bd0fcaf7 am: 087ec3447d

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

Change-Id: If77ded3f38dce9227273b016fb82ebfddd2fdd0a