Merge "Revert "Replace RemoteCallback with AndroidFuture in PermControler""