Merge "Fix discrepancy between from text vs source android_test_frameworks_core_stubs_current" into main am: f8ced8b7c5 am: e0e8da2f72 am: 8643a2aa5c

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>