[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO...

[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 5714e607 -s ours am: 7221a1de -s ours am: 35d87776 -s ours am: 2d74954f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I591ad9a79952b16aed913d4ea61f481b5e378e3d