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" into rvc-d1-dev-plus-aosp am: 0b1f9369 am: dd851236

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

Change-Id: I6c06e9ff584f19994089f592bd6fc60c0c927dc9