Merge "Merge "Start screenshot timeout even if saving fails" into rvc-dev am:...

Merge "Merge "Start screenshot timeout even if saving fails" into rvc-dev am: abbdec42 am: 463ea65a am: 73560bef" into rvc-qpr-dev-plus-aosp am: 131ae0a0

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

Change-Id: I1d3e95b5bbeedd57d02cd541436420ced4dfbe14