Merge "Fix the deadlock caused by guarded CompletableFuture in autofill session"