[automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" am: 253d4be6 -s ours

am skip reason: Change-Id Ie04d133d692c1a3d70c62a339ee002e9081c6b4d with SHA-1 4e87af59 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f7fbd7ad9d388cea3be4f40c736ea94d750d69a