[automerger skipped] Use a copy of lock screen secret in recoverablekeystore....

[automerger skipped] Use a copy of lock screen secret in recoverablekeystore. am: 50f03357 am: ab420a48 am: cdfaa8d5 -s ours

am skip reason: Merged-In I0ed183eb3a30c16db77cb12b2347794796dd88d8 with SHA-1 07b312c8 is already in history

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



Change-Id: Ib3af85764c0036b696aa319e6726b01320a77e16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>