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

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

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