Merge "SF: don't skip draw for clearContent" into sc-dev am: 311ea1b9 am: 70d39c54 am: 2b239b4e

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

Change-Id: Ib2acbef14efdcaaa842c3a9c9969ee98398c8245