Merge "Changed ravenwood-junit to use module_current" into aosp-main-future am: 88bf750b

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



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