[automerger skipped] Merge "Reset staticInfo if static meta fetch fails" am:...

[automerger skipped] Merge "Reset staticInfo if static meta fetch fails" am: c09e47c2 am: ee4e7fa5 am: 4884ed4e -s ours am: fe02d46d -s ours am: 4e013928 -s ours am: d7f6120e -s ours

am skip reason: Merged-In I33fba8a568cd195dfac0e438f8cae4a411bd04da with SHA-1 df54e93d is already in history

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



Change-Id: I2379998dd478f91d0c936c431189ac26dad0c5dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>