Merge "Update winscope dependencies" into sc-dev am: b184ea69d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/14185371 Change-Id: I0d0f7e6b258718386fd8c12decb41677bdf9319a
This commit is contained in: