Merge "DO NOT MERGE: drm_hwcomposer: Use Planner interface to provision planes am: 8cc4e2a2de am: c04f1f9a2f" into nyc-mr1-dev-plus-aosp
am: 21c2ce2f55  -s ours

* commit '21c2ce2f55520ed56586f9b07343d5b63d122a1e':
  DO NOT MERGE: drm_hwcomposer: Use Planner interface to provision planes

Change-Id: Ib11de6ab37a6a4c2ab1e6f292c4b650bc091c939