[automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 74b6e62aed -s ours am: 678758d116 -s ours am: 64abdb45f7 -s ours am: 13740f642d -s ours am: fb9b1b080f -s ours

am skip reason: subject contains skip directive

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

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