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

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

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



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