Merge changes from topic "pacproxy-service" am: 87c4904ab2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I29e9e324f25e584d645900f83d31a00a4e151cbb
tree: fdfc6a2f1dcc1e83c3570f22bbed6f92d64f02fc
  1. framework/
  2. service/
  3. OWNERS