Merge changes from topic "pacproxy-service" am: 16f50075b1 am: 688ae36dcb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife210de3adbdaff6c88caf744d805571b365b294