[automerger skipped] Merge "Add missing HAP_CONNECTION_STATE_CHANGED intent"...

[automerger skipped] Merge "Add missing HAP_CONNECTION_STATE_CHANGED intent" into tm-qpr-dev am: 0a365c85 -s ours am: e1b7821c -s ours

am skip reason: Merged-In I631d305fd843f060069cce817517aeb0f745d970 with SHA-1 ef08c8a7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20836627



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