[automerger skipped] eatt: Fix for the crash on incoming channel creation am: a73433ee -s ours

am skip reason: Merged-In Ic5e8c027dc45eec942457f09c987ec64cfafb761 with SHA-1 7d12e8eb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/15028040

Change-Id: Ic9c131728bb3b2bf1800616c2b429d8c50437808