[automerger skipped] Merge "RESTRICT AUTOMERGE Restart recognition when failing to deliver event" into sc-dev am: 43993b70c4 -s ours am: 82f80823e6 -s ours am: bae0966e26 -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
This commit is contained in: