[automerger skipped] Merge "Set min_sdk_version (for non-mainline files)" am:...

[automerger skipped] Merge "Set min_sdk_version (for non-mainline files)" am: 990e294f am: c33deac9 -s ours am: ac739dc9 -s ours am: 8e4f26a2 -s ours am: 9449beb0 -s ours

am skip reason: Change-Id I55336e644990d3f175e0c011856b52ec600e452a with SHA-1 e3cf41a2 is in history

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

Change-Id: Ieb49383414e205db28754284548ff5e64ad1d913