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

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

Change-Id: I273f7a39cd793e17930e1bb855e273b37928f1fd