Merge "Remove hidden API usage from ProxyTracker" am: 3f4d2a6f67 am: 6ddd31dc3a am: 15587cc7c7

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

Change-Id: I4c5e91ae575c5cd79198a47572a7403e12d64dfa