[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 -s ours am: b50c2a3f -s ours

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

Change-Id: I6366c3d76e0a5f61fa90eb93d8ed2323f87e8504