Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  Define the data parameter for POWER_HINT_INTERACTION.
  HWC: Add a color transform attribute per display

Change-Id: I3fd29a6d734563532c7061246488f4c3d274b87a