[automerger skipped] Merge "Fix a bug where a spurious capabilities callback is sent." into rvc-dev am: acdacbfe65 -s ours
am skip reason: Change-Id Id7d8bba486bada1a7ba5b0f152d2aa02e407f249 with SHA-1 d568791283 is in history
Change-Id: I655cca7c9e1ba6ba4fae95b221b1e46e91da5f6d
This commit is contained in: