Merge "Replace RemoteCallback with AndroidFuture in PermControler"