Merge "Update mediacodec policy with stat" am: 589c173758 am: a9200367bf

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie333e38bbf61121718f95c2cbfad20639c240ec2