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 am: 38cd5c67

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



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