Merge "Add occlusion state for surface flinger trace" into rvc-dev am: 12623eba4c

Change-Id: I94dbbbd2ce80bb95cbf2af788c539b007bad46f6