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

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

Change-Id: I502e73bec477df18afb15491960833ffc4c36d6c