Merge "Fix discrepancy between from text vs source...

Merge "Fix discrepancy between from text vs source android_test_frameworks_core_stubs_current" into main am: f8ced8b7 am: fdb527b1 am: c7e80199

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



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