[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: d3b674af -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7ba0dc9bd24b15d7f8b6222f95adc20d4c4af9d2