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: 187c2f86 am: e8ddc4ab

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

Change-Id: Ife06a8785cfc47ef52a085a9dc05c85f1d08b6bd