Merge "Remove references to win_sdk" am: dddbdc3b15 am: a9e069273a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933148

Change-Id: I503f1557e759c74c8cfbbc31a7f265877792b1ae