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

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

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