Merge "Make fix_unlocked_device_required_keys a build-time flag" into main am: 826c442fcf

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

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