[automerger skipped] Merge "tests: Multiple unit test fixes" into tm-qpr-dev...

[automerger skipped] Merge "tests: Multiple unit test fixes" into tm-qpr-dev am: 304d2b34 -s ours am: d25373f7 -s ours

am skip reason: Merged-In I5953c49bb11af13fe9578be709f02582080124f3 with SHA-1 8071a43a is already in history

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



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