Merge "Do not re-initialize synthetic password" into rvc-dev am: 5ad4ec37a0 am: b00cccb819

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

Change-Id: I0aef9e528ffbf39d4590cbca17bc38cd9c927bd7