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

Change-Id: I982b99f2d31d2dc82f22be4d6e3dc167ef298e51