tree bc2a50acf31868c943f0a3658b7c5a33fe5e4d7a
parent a9e51bcecc029456330d5e9e4abeb0ba98ff8ec0
parent 75ced70736f22bd8cf07b6bd45514c04bb4bda7f
author Eric Biggers <ebiggers@google.com> 1698082647 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1698082647 +0000

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>