[automerger skipped] VT: Dropping P-frames till I-frame provided am:...

[automerger skipped] VT: Dropping P-frames till I-frame provided am: 6ffdc403 am: 15cd5437 am: 0e08d718 -s ours

am skip reason: Change-Id If81dd3c154071953a7fd0d1cd354c5432bf4cb43 with SHA-1 5c616438 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I584d116e173888abb4fcb5e38a06ad048a66a39a