Merge "Make fix_unlocked_device_required_keys a build-time flag" into main am: 826c442f am: 82f913da

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



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