Merge "Downgrade Window JetPack" into rvc-dev am: ada8355bc5 am: e850f36200 am: 5664e23270

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

Change-Id: If9777926e73f60b332d0ff828715c949a6feedc2