Merge "Use formal API for ActivityThread to set proxy" am: 86ecbddaf0 am: 2074561653

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifae677c9751d618617083696a89252f11bd222b4
tree: 562dabee2950ac23550bbc4fb133030d80f612e2
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS