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 am: 03b426c9

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

Change-Id: I01d9023caa6646c15530d812f52a9ce83e339b88