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

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



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