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

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

Change-Id: I1e60124a4253c64cebeceede5123b5f65ba3ce81