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

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

Change-Id: Ieeb2a8fe243eb7acbf0112a9b7534530921a4c7a