[automerger skipped] Merge "media: clarify the use of profiles for MediaCodec...

[automerger skipped] Merge "media: clarify the use of profiles for MediaCodec encoders" am: 933a0c09 am: 17b3833c am: 3d1eb8b5 -s ours

am skip reason: Merged-In Ib38a6b0af75f43e88a978e88073bc75d8a604cb1 with SHA-1 a9b03a6b is already in history

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



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