Merge "Update constant names." into tm-dev am: 01ad893e8c

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

Change-Id: I7e59aefcde83e5cf119c895b48c3f64c2df7e30e