Merge "Merge "Move the implementation of ProxyErrorListener to libpac" am: ca712e75a9 am: f526679a02 am: 861b2b29c8"