Merge "Ravenwood: sdk to test_current" into main am: 0b37ad8392 am: 43e78a9ae3

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

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