Merge "Use an isolated token to represent shell transitions" into tm-qpr-dev am: e7aef726

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



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