Merge "Fix the infinite loop bug for AndroidFuture.ThenCombine."