DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 2d20bee7

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



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