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

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



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