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 am: f1441467

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

Change-Id: I54abb19f2bd2e56f913cf7a94a84ebe6a5c5bc65