[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 -s ours am: cc8c7a4f -s ours am: ebfcdcb4 -s ours am: 778011d9 -s ours

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

Change-Id: I5189f5ca80212d64584f7f95591de453be949744