aml_tz4_331012050
[automerger skipped] Merge "[DO NOT MERGE] Fix winscope on R" am: 45fbf11f45 am: 89181a94c6 am: 7adadbf8c9 -s ours am: 8bd8b591c2 -s ours

am skip reason: subject contains skip directive

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

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