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

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

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