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

[automerger skipped] Merge "Fix a bug where a spurious capabilities callback is sent." into rvc-dev am: acdacbfe am: 7918495d am: 1a18d483 -s ours

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

Change-Id: I4c1667bda67f3c8cf19c5407963e2a28e0443ece