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

am skip reason: subject contains skip directive

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

Change-Id: Idc7ccd21d2e4d77f4f5a79d96ba552e57641e566