Merge "restrict sizes shaped (and requests to codec to shape)" into sc-dev am:...

Merge "restrict sizes shaped (and requests to codec to shape)" into sc-dev am: 0ff42938 am: 48dea755

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

Change-Id: I163915b25476f31f891ed70945e14e1e0842244a