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

Merge "Merge "Only show error if screenshot process dies within timeout period" into rvc-dev am: 3a51a85a am: 762b9fb1 am: 547c1928" into rvc-qpr-dev-plus-aosp am: f86e1980

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

Change-Id: I6b00912c176d1ca5498fd878a4d257f2a56c5429