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

[automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 8c90891a am: 42c14393 -s ours am: 1d6a1c98 -s ours am: 11a01ff2 -s ours am: aa38c573 -s ours

am skip reason: subject contains skip directive

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



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