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

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

Change-Id: Idd7ae6ad01db35ed2ea47abab183ae423439ede9