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

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

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

Change-Id: I8c58238d2530cf69d9364d68cba272714cd41eb9