Merge changes from topic "non-tee-secure-decoder" am: 3fbe65fcf6 am: 4e87af59df am: 257f8aefa8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7c383825674a1110fb9dbc2d6460126f550c573