Merge "Remove AndroidFuture from AppSearch." into sc-dev