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

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

Change-Id: Ibf24ad31c0e11b9d77f5d0cc582ad7f56331dd58