[DO NOT MERGE] Fix winscope on R am: 8bcf476e55

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

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