Merge "Use formal API for ActivityThread to set proxy" am: fb0f9e3275

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I917bf20c932395ac07089059e1c46fe46de4d1f4
tree: 7d844b4bc7aced8c1637d9a80c7f0ec705419e72
  1. framework/
  2. service/
  3. OWNERS