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

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

Change-Id: Ib82ab81eb8f7f70f120ecfb7e1eff7bae296792f