[automerger skipped] Merge "Make mCurrentPipTaskToken null when app crashes"...

[automerger skipped] Merge "Make mCurrentPipTaskToken null when app crashes" into udc-dev am: 2a2a1b12 am: faa6dcf4 -s ours

am skip reason: Merged-In Id869f78dbf85f009509082181590e224a6d7f893 with SHA-1 931efa54 is already in history

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



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