Merge "Expose Context#PAC_PROXY_SERVICE as module lib API" am: 248a42ca89 am: 06007f0302

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664305

Change-Id: If0e78b4bdce820f9eb22f231f57d5ce841005328