[automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 2d20bee73d am: 0c4ae95734 -s ours am: b899c83312 -s ours

am skip reason: subject contains skip directive

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

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