Merge "Merge "Check for null service in ScreenshotHelper" into rvc-dev am:...

Merge "Merge "Check for null service in ScreenshotHelper" into rvc-dev am: 1e23e8e2 am: 60a013ce am: 9d49aef7" into rvc-qpr-dev-plus-aosp am: b125643c

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

Change-Id: I4a13d812664c26b917bf03562a23b9a8069bfc64