[automerger skipped] DO NOT MERGE: Context#startInstrumentation could be...

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

am skip reason: subject contains skip directive

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



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