Merge "media: clarify the use of profiles for MediaCodec encoders" into...

Merge "media: clarify the use of profiles for MediaCodec encoders" into udc-dev am: 5335811d am: 2ffccee1 am: 5ad237b2 am: c4168021

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



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