Merge "Make sure the color background is only cleared once" into sc-v2-dev am: f68d0b927f am: b69f7cdc77

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

Change-Id: I47e8065da76c4101638c90ad196caea9d88bc46f