Merge "Fix a couple shell unit test regressions" into tm-qpr-dev am: 4cc40c76 am: eca9a2fd

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



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