Merge "Revert "Turn off adb on user builds."" am: 7be6751e00

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

Change-Id: Ice7ef8d7512613dc5937e6fece5873ea9f8cd463