Merge "Enable device integration test in ATP" into main am: fd2a16ef35 am: 6300446632

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

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