[automerger skipped] Merge "MediaCodecInfo: consider only critical flags for...

[automerger skipped] Merge "MediaCodecInfo: consider only critical flags for level support check" am: f7cb3315 am: 4cb4bb64 am: dae877eb -s ours

am skip reason: Merged-In Ide3782882216135e5fac4f53bab21123a73f87b3 with SHA-1 7c887bf6 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2559912



Change-Id: I9de0043f28620c6a7426c1589e1e4eacdf730a12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>