Merge "[Ravenwood] Cleanup and update RavenwoodEnvironment" into main am: 77754502f5 am: 05f35a8f25

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

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