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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1475bee722aae6b835c16d7c874f165a6f586554