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: I4752c8ef63aaa64aebb4c44471de4b4f95c629a4