Merge "Remove hidden API usage from ProxyTracker" am: ed15b01b0d am: 2f04604df2 am: 330ba163d9

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

Change-Id: I4c5e91ae575c5cd79198a47572a7403e12d64dfa
tree: 7fff2130f405913e18285bc8882466101895e7f8
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS