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: 166b9e04

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

Change-Id: I5f111272ad1099d168bf6b78fffdf592f1092f31