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 am: 1125fdf9 am: 0ca3c372

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



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