Merge "Enter active mode when receving RING in watch" am: a88203a1 am:...

Merge "Enter active mode when receving RING in watch" am: a88203a1 am: 5691b4ef am: 7d252e48 am: 7cf0d2b9 am: adbd88b0 am: ab777e0b

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



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