Merge "Update the constants to use Environment" am: 99e23bcc0b am: 229797193a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2064568

Change-Id: Ic17cc9908b0230c8c185aa51e909eee28aec4dda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>