Merge "Replace Proxy hidden constants and methods usages" am: e3be1ecb38 am: 5c5b36f19d

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574955

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f3a634620e6467da136e0454ab98c994d7a23a6