Merge "DO NOT MERGE: drm_hwcomposer: Count all layers with content in SquashFrame am: c74c8b9339 am: b38dbf65e0" into nyc-mr1-dev-plus-aosp