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

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

Change-Id: Idd7ae6ad01db35ed2ea47abab183ae423439ede9