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

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



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