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

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

Change-Id: I4f1210d5aac903e2a2927b70d7d467ee2010f7b1