[automerger skipped] Merge "FastPath: Clean up state queue instantiations" am:...

[automerger skipped] Merge "FastPath: Clean up state queue instantiations" am: d2e62fa9 am: 0b212514 am: 43ad9c76 -s ours am: 5beffd5f -s ours

am skip reason: Merged-In I5d92b77905586e1fe3acaa4bbafd4d7dc55af3e0 with SHA-1 0631a5de is already in history

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



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