Merge "FastPath: Clean up state queue instantiations" am: d2e62fa9d8

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

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