Merge QP1A.181119.002

Change-Id: I2f561a126debf7ea9b5588f8697fa90a8c282cdd
tree: fc1db12f7237c69b619e09a29719911f3e77afe3
  1. libhwcomposer/