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

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

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