Merge "Re-enable the net_test_device as host test" am: e4cbfd22 am: 1ca3a6e3

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



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