Merge "Merge "Downgrade Window JetPack" into rvc-dev am: ada8355b am:...

Merge "Merge "Downgrade Window JetPack" into rvc-dev am: ada8355b am: 59da843b am: 21b220c5" into rvc-qpr-dev-plus-aosp am: a6e0d073

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

Change-Id: Ib0cb2d75959fd6b9b408442cbe43c2198652fffd