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 am: 812d3e98

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



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