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

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

Change-Id: I22d08629ebeab851a62b47b266c7f811e569ee9f