Merge "[sf] Fix layer ids for background color layers" into udc-dev am:...

Merge "[sf] Fix layer ids for background color layers" into udc-dev am: a953a920 am: 1e669a97 am: a51f4dab am: 9d85b32e

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



Change-Id: Ib507edf664c18ed848e6a2f5ae40ccd1eac29f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>