[automerger skipped] [DO NOT MERGE] Fix winscope on R am: 8bcf476e55 am: 65ccb4dc67 am: 62ad5eb549 -s ours am: de64e83b1d -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2071103

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