[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT...

[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: f7f95ead -s ours am: 4cbbdf65 -s ours am: 97322710 -s ours am: 5746f5f1 -s ours

am skip reason: Change-Id I96e67a481b839c9de4a5fea0d7a540b93441133c with SHA-1 9c78c5c2 is in history

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

Change-Id: Idafd3a8cdabeb5ba4aca4d79667cf9d656f96ae3