Merge "envsetup.sh: fix adb tab completion" am: 1ef63b94 am: d436fa70

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



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