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

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



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