Merge "Merge "Remove password shards from memory" into rvc-dev am: 01bd0fcaf7 am: 82e9a3d251" into rvc-d1-dev-plus-aosp am: a8176f3fb2

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

Change-Id: Ibbd5886a56862f3fc449254626415b620b0770b0