Merge "Update ravenwood TEST_MAPPING" into main am: 227e7290cd am: 11dd8f72cf

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

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