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

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

Change-Id: I2d609875a3a31586626a82dddbfcb015bf5ca0bf