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