[automerger skipped] Merge "Restore the taskAffinity behavior of...

[automerger skipped] Merge "Restore the taskAffinity behavior of singleInstance Activity" into udc-qpr-dev am: 96c01992 am: f5e8ee68 -s ours

am skip reason: Merged-In Ib68e9d4abe02cd94f46045ed0a9cea4212f24e3d with SHA-1 27fbbeb2 is already in history

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



Change-Id: I4feb1607e2f4d6cadae5921d6f81184ee0a5249d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>