Merge "Rewrite how we abandon sessions" into rvc-qpr-dev-plus-aosp