Merge "Restore AsyncTask Executor after AdapterServiceTests" am: 4064ec51 am: cf3667ab

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



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