[automerger skipped] Merge "Consider SLICE_REJECTED as permanent failure" am: 2e62b92955 am: c1f05faacc am: c375325532 -s ours am: 691426b8c3 -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: I1a5f0125102f9b4b0d5042016ecfbf6ba63777a2
This commit is contained in: