Merge "H4ProtocolTest: Time out after 5 seconds" am: 125ec2bb9c am: 368118bac9

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2429174

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