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: 11e31f86 am: ec217d20 am: 729073e1

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

Change-Id: I515b6382afc49993f3c200b348402dce9395f25f