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

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



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