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