[automerger skipped] Merge "Fix updateRecentTasksSplitPair unexpectly" into sc-v2-dev am: 588771a9de am: c015533563 -s ours

am skip reason: Merged-In I42b4c79558467dec23b789a3b5cc2f8f38cd1c36 with SHA-1 2079686919 is already in history

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

Change-Id: Iff5cc215a0cf50b7567728f7791f2b557a0a0d9a