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: Ide2d1a9688a58543a5bd4afc71ccafcb46436771