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

Change-Id: I10f6cf4f4df59472c2e5598886ababcc7eec51f3