Merge "Cert: Fix test infra to meet latest environment requirement" am: cbbb39bb

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



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