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

am skip reason: subject contains skip directive

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

Change-Id: I99ef33a248ef7f139dd315efc0ea111f188b16f6