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

am skip reason: subject contains skip directive

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

Change-Id: I4fd8e1b2996ea304bef9fa2cd9b5ed8f5555df84