Merge "Merge "Remove password shards from memory" into rvc-dev am: 01bd0fcaf7 am: 087ec3447d am: 867adf2a5e" into rvc-qpr-dev-plus-aosp