[automerger skipped] Merge "Move TestActivity to under test directory" into...

[automerger skipped] Merge "Move TestActivity to under test directory" into tm-qpr-dev am: 18779d7d -s ours

am skip reason: Merged-In I0274441514c257b0237d1459514729ff814cd4a4 with SHA-1 0d0a64d3 is already in history

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



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