Merge "[automerger skipped] Merge "Fix a bug where a spurious capabilities...
Merge "[automerger skipped] Merge "Fix a bug where a spurious capabilities callback is sent." into rvc-dev am: acdacbfe am: 7918495d -s ours am: b50c2a3f -s ours" into rvc-qpr-dev-plus-aosp