[automerger skipped] Merge "BluetoothInCallService: Make sure non conference calls have indices starting from 1" into tm-qpr-dev am: 4c099d01 -s ours am: 115f008d -s ours

am skip reason: Merged-In I565e08c9019ce90c59e96d519417efeb65e5c39d with SHA-1 37b9e124 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/20601738



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