Merge "[Ravenwood] Update RATR to setup environment ASAP" into main am: bc31fb6166 am: ff2f713eb9

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

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