Merge "MediaFormatshaper off below 320x240" into sc-dev am: d9b673190f

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

Change-Id: Ic3934ab683dc3776da11dcc766524e1f37b5f6e5