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

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

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