Merge "Rename the fix_unlocked_device_required_keys flag" into main am: b932bbb9

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



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