Merge "[automerger skipped] Merge "Fix a bug where a spurious capabilities...

Merge "[automerger skipped] Merge "Fix a bug where a spurious capabilities callback is sent." into rvc-dev am: acdacbfe am: 7918495d -s ours am: b50c2a3f -s ours" into rvc-qpr-dev-plus-aosp am: bc8e1512 -s ours

am skip reason: Change-Id Id7d8bba486bada1a7ba5b0f152d2aa02e407f249 with SHA-1 fe5e23f8 is in history

Change-Id: I47c91c553f8a576948f295825681667ba25597d4