Merge "Revert "Add variables for init.environ.rc"" into main am: d0b03dd8

Original change: https://android-review.googlesource.com/c/platform/build/+/3202811



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