Merge "Fix discrepancy between from text vs source android_test_frameworks_core_stubs_current" into main