Merge "MediaFormatshaper off below 320x240" into sc-dev am: d9b67319 am: c6bc6e3f am: a0072208

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

Change-Id: I4465a6be65e7bedd90837e1ed41eedd9b9b305cf