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: e0e8da2f am: 8643a2aa

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



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