Merge "Buffer(Queue/State)Layer: Consolidate preparePerFrameCompositionState" into rvc-dev am: 8aa787d298 am: 10157e49e5 am: 393cc376c9 am: 1f47a9d3da

Change-Id: I183a75ad6588f8bd78758ad2ba9a62782321b55b