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

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

am skip reason: Merged-In Id869f78dbf85f009509082181590e224a6d7f893 with SHA-1 755d0c3d is already in history

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



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