[automerger skipped] Merge "Handle root inflammation event properly." into...

[automerger skipped] Merge "Handle root inflammation event properly." into tm-qpr-dev am: 08922062 -s ours am: 6a60a13b -s ours

am skip reason: Merged-In I934918605335e3d12cff14eedd0cea96a9e01df5 with SHA-1 ef5180b3 is already in history

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



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