Merge "Only show error if screenshot process dies within timeout period" into...

Merge "Only show error if screenshot process dies within timeout period" into rvc-dev am: 3a51a85a am: 762b9fb1

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

Change-Id: I4caaf1f4dc807497301ee7400a73fdd2fc416435