Merge "Make mCurrentPipTaskToken null when app crashes" into udc-dev am: 2a2a1b1266 am: 372d2ee787

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

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