Fix crash when proxy exclusion list is null.
Fix crash when proxy exclusion list is null.

Also cleaned up source a little bit and eliminated a warning.

Bug: 2964821
Change-Id: I35825bb345742ea1a1854e8998aa67e353deaa17

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base