[automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 74b6e62aed -s ours

am skip reason: subject contains skip directive

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

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