Merge "Downgrade Window JetPack" into rvc-dev am: ada8355bc5 am: 59da843b13

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

Change-Id: I622081f839eb3d6827101e7320a15a41a2e77c8f