Merge "SF: don't skip draw for clearContent" into sc-dev am: 311ea1b9 am: a4d1c45e am: f8d58659

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

Change-Id: I4d89955ba28861f2553e70b0cfb4f023a388e8f5