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

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

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



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