Merge "Update the constants to use Environment" am: 99e23bcc am: 22979719 am: f19bebfc

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



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