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