Merge changes from topic 'am-07760a7359434d758da865299f519df1' into nyc-mr1-dev-plus-aosp

* changes:
  Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466 am: 8940d2b0 am: bb276261 am: 6c35cf24 am: 42a59833 am: 75095e6f am: 7c625e19 am: 54a62d5f am: a5a2c88f am: 7ff57eaf am: 94c8855d am: 50615e49 am: aa98ab56
  DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6  -s ours am: 077534b1 am: 4c559cda am: 24ceca96  -s ours am: 88c9eae8 am: 1fa817c0 am: 040cf140 am: 0905c8f3  -s ours am: d39c0a8d am: d8e548f6