Merge "Fix issue with invalid aspect ratio causing issues resizing" into...

Merge "Fix issue with invalid aspect ratio causing issues resizing" into rvc-dev am: f8fe1d97 am: 03295d8c am: 88685e7b

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

Change-Id: I22fd62679e7206af0ba555d50f865e52ba5471c3