Merge "Bluetooth HAL: fix ISO handling for H4 protocol" am: 389e9aa728 am: a088953e11

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

Change-Id: Ia0478fe7751009940814bc933cf847b246da460c