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

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

Change-Id: Ie2f9e9c73294b4f5918204aafb44b2fc92ebd386