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

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

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