HWC2: Set composition type before setting buffer am: 0f67b3f01f
am: 7af047d29c

* commit '7af047d29cf823a83142b91113de0933f15eeaec':

Change-Id: I93fa60a3040811b3b8039fd620162be21f8ca609