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