[automerger skipped] Merge "Consider SLICE_REJECTED as permanent failure" am: 2e62b92955 am: c1f05faacc am: c375325532 -s ours

am skip reason: Merged-In I3d30f9ed4b9ecbcede270d586ff9c6c9c4c0c39f with SHA-1 f893a72acb is already in history

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

Change-Id: Ib0c23b6fdeecc98ee7aa8198f1273d9d39fe5ab0