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

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

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