[automerger skipped] Merge "Enter active mode when receving RING in watch"...

[automerger skipped] Merge "Enter active mode when receving RING in watch" into tm-mainline-prod am: 56d0a41f -s ours am: 4452a100 -s ours

am skip reason: Merged-In Ibdc65d41d43a7fac8a861bb30587671fcbadd397 with SHA-1 bf7f13fb is already in history

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



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