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

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

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



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