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

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

Change-Id: I2681da6b3919efa0bf86241169219567c15e1864