[automerger skipped] Merge "Set the default screenshot delay to 0ms" into...

[automerger skipped] Merge "Set the default screenshot delay to 0ms" into rvc-qpr-dev am: 96c7d236 am: 13edc9d0 -s ours

am skip reason: Change-Id Iab989ecf14ef379658130adbced241e084554e63 with SHA-1 bf828226 is in history

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

Change-Id: Ibac51d1e6e4d353731dd80f4f50259cde9486331