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

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

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