Merge "Merge "Preserve interrupted state across waiting for future" into rvc-dev am: 8aebfdee am: 882b1984" into rvc-d1-dev-plus-aosp