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

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



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