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: 29ca4d78

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

Change-Id: Ic58b5693c237ba4c360a22d1f6fa4e8280d1e0da