Merge "Make fix_unlocked_device_required_keys a build-time flag" into main am: 826c442f am: 75ced707 am: f16f3d4f

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



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