[automerger skipped] Drop separation between BA and Go module sdk am: fc7afb1f37 am: 4e3fce2577 -s ours am skip reason: Merged-In Ifc71e9f0d208dba92e798ae712622dc987f55d3c with SHA-1 810d6681b4 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/DeviceLock/+/3097680 Change-Id: I458b706b9e349982bdc1852782a8a19cda698fe6 Signed-off-by: Automerger Merge Worker <[email protected]>