Merge "Fix another adb module backwards compatibility issue." into main am: a36add20fd

Original change: https://android-review.googlesource.com/c/platform/packages/modules/adb/+/3127736

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