[automerger skipped] Merge "Expose Context#PAC_PROXY_SERVICE as module lib...

[automerger skipped] Merge "Expose Context#PAC_PROXY_SERVICE as module lib API" am: 248a42ca am: 06007f03 am: 4a144513 -s ours am: db94cf9c -s ours

am skip reason: skip tag Change-Id I4341e177b61df0311f0a3234f8814a0ae2cf9a1b with SHA-1 62718c2b is already in history

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

Change-Id: Ie27a42480eeffbd3360072b78b6e56e0721451a4