Merge "Downgrade Window JetPack" into rvc-dev am: ada8355bc5 am: 59da843b13 am: 25469d52d0 am: 63d56f5e82

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

Change-Id: Ic985de0254ffdcae375de72e1464bca018b73d6b