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

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

Change-Id: If429d82e0f21d3764cc8daaaf2e288e1062034ac