[automerger skipped] Merge "RESTRICT AUTOMERGE Restart recognition when failing to deliver event" into sc-dev am: 43993b70 am: c85b6716 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I89ef38724e978ad4572ddf7316c8d5aba6a32eaa