[automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 0bf31e3efc am: 4b94c7f40f -s ours

am skip reason: subject contains skip directive

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

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