Merge "Skip task snapshot if display has not been enabled" into sc-dev am: c8bbb99a am: aa11f653

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

Change-Id: I3171b5a3717a4536e5184f2f21761fbc7de421f7