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

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



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