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: Ie7c727d71e0d4032f74dfc87df02f9c3d89cb7af