Merge "[DO NOT MERGE] Fix winscope on R" am: 45fbf11f45

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

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