Merge "SyntheticPasswordManager: fix naming of scrypt parameters" am:...

Merge "SyntheticPasswordManager: fix naming of scrypt parameters" am: cb854dc1 am: 5282397a am: 8e2e2418 am: d3048e75

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2132299



Change-Id: I3b26d9548fe64fe1f1d8dc3d89461247fb1f5fe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>