Merge "Allow non-zero HCI interface numbers" into main am: 13c04c29cc

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

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