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

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

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



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