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

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

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



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