[automerger skipped] Merge "Restore AsyncTask Executor after...

[automerger skipped] Merge "Restore AsyncTask Executor after AdapterServiceTests" into tm-qpr-dev am: 31e7ebfb -s ours am: 82f5d7d9 -s ours

am skip reason: Merged-In Ifab113acfdfa487981c894882f901e537cfd03c9 with SHA-1 8e8738a1 is already in history

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



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