[automerger skipped] Merge "Don't increment colorLayerCounter on surface migration" into sc-v2-dev am: c6c53dbf -s ours am: 0710c69c -s ours am: 47cf5667 -s ours

am skip reason: Merged-In Ifc93d5482bad9591e942e4be91e0039daae743b1 with SHA-1 6a1d698a is already in history

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

Change-Id: Ief4cfbbd6d85aced46efacd4cc7e15bcb0663f67