Merge "Fix adb_py module." am: 085867a244

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

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