Merge "Fix adb_py module." am: 085867a244 am: 37a0149a2d am: 937c03c8d4

Original change: https://android-review.googlesource.com/c/platform/development/+/2394273

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