Merge "Add devicelock to the list of individually toggleable module." into...

Merge "Add devicelock to the list of individually toggleable module." into main am: d7965bd1 am: 77b936b7

Original change: https://android-review.googlesource.com/c/platform/build/+/2763932



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