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: 9da9c4ea am: d9c9c02f am: e7ff5951

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



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