Merge "Start screenshot timeout even if saving fails" into rvc-dev am: abbdec42 am: 187c2f86 am: e8ddc4ab am: 00fa4fad

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

Change-Id: I4621ccfd155b59ea126f2f6d22c32e1f3cd536c4