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

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



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