Merge "Rename the fix_unlocked_device_required_keys flag" into main am: 4835baecd7

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2843813

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