Merge "update scale mode to MediaCodec under NuPlayer::instantiateDecoder"...

Merge "update scale mode to MediaCodec under NuPlayer::instantiateDecoder" into main am: 6bfb6843 am: 2e5ab590 am: bfe2173b

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2827233



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