Merge "Fix some shell unit tests with shell transitions" into tm-qpr-dev am: 0b5f5075

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



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