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

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

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