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: 9da9c4ea am: d9c9c02f

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



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