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 am: d53ddbcf

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



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