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

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

Change-Id: I6118e70a9eece6b5a3d7b7a0e67efdd73074530d