Merge "DO NOT MERGE: drm_hwcomposer: Don\'t use Plan() in SquashAll am: 8eb85ff7d7  -s ours am: 45ea1b1c69" into nyc-mr1-dev-plus-aosp