Merge "[Ravenwood] Sync AOSP and internal main as close as possible" into main