[Ravenwood] Sync AOSP and internal main as close as possible

Make internal code more merge-able with changes in AOSP

Flag: EXEMPT host test change only
Bug: 292141694
Test: $ANDROID_BUILD_TOP/frameworks/base/ravenwood/scripts/run-ravenwood-tests.sh
Change-Id: I83f95346f88f68f7cb4e75204d4181b7e4ed8b8b
1 file changed