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: 4f2b0abc am: 21cab1a0 am: 4aabdf9d

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



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