[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: 13b822c460 -s ours
am skip reason: Change-Id Id7d8bba486bada1a7ba5b0f152d2aa02e407f249 with SHA-1 1112dd3d83 is in history
Change-Id: I5189f5ca80212d64584f7f95591de453be949744
This commit is contained in: