[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: cd30cd61 -s ours am: 1d79e8c4 -s ours am: 4b44d8d3 -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: Ied3a3223e76f47b8e1a3469e38bd54fef62fc121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>