[automerger skipped] Merge "Don't increment colorLayerCounter on surface migration" into sc-v2-dev am: c6c53dbf39 -s ours am: 0710c69c9b -s ours
am skip reason: Merged-In Ifc93d5482bad9591e942e4be91e0039daae743b1 with SHA-1 6a1d698ace is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17255341
Change-Id: I86714fa8c22eea054cda9287d88844b94a0aa1cb
This commit is contained in: