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

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

Change-Id: I8c2199f4312d1f07dcc1997deb927a2ad992a23d