Merge "Add support to disable adb root on userdebug builds based on product...

Merge "Add support to disable adb root on userdebug builds based on product config" into main am: 878141b8

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



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