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

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



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