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: a4c916f7 am: 6d27429a

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



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