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

Change-Id: Ia52d260b3b1baea33ecd1931d32bf31018d70d47