[automerger skipped] [automerge] Don't increment colorLayerCounter on surface...

[automerger skipped] [automerge] Don't increment colorLayerCounter on surface migration 2p: 6a1d698a am: d789bf9b -s ours am: 085884a1 -s ours am: b6dd6aec -s ours

am skip reason: Merged-In Ifc93d5482bad9591e942e4be91e0039daae743b1 with SHA-1 5bf81c05 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17255341

Change-Id: If3cd381924a233732a7f14c9e3d26703a02573a6