Merge "Revert "Ravenwood: sdk to test_current"" into main am: d660759c06

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

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