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

Change-Id: Ie9e842b6362f68f0de29ff3ebe4141297eb89d64