[automerger skipped] Merge "Remove TaskInfo#topActivityToken usage in size compat for security" into sc-dev am: e7ed99bfc2 am: 0a703480d2 -s ours
am skip reason: Merged-In I097b9f02e8435e6765695b9d5a531a4e165bac66 with SHA-1 1245aefa49 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15156978
Change-Id: Ifaebd6bff85d1da968ad0c056b0a3a01636f6cb5
This commit is contained in: