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

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

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