Merge "Buffer(Queue/State)Layer: Consolidate preparePerFrameCompositionState" into rvc-dev am: 8aa787d298 am: bb950eca60 am: 22e2313e76 am: 4aa54fe458

Change-Id: I57cba5362eaae122e7924bf2b42b9619ead73f9c