Merge "Reland "Add variables for init.environ.rc"" into main am: 351106c2

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



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