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 am: 547c1928

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

Change-Id: I7318759cace076620c3924c56ef950826adf513a