Merge "Always startOrMigrate connection when caps change" am: 52885599 am:...

Merge "Always startOrMigrate connection when caps change" am: 52885599 am: 38904b15 am: 6ae4584b am: 4972abfd am: 55ee0951

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



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