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

[automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 0b75cda3 -s ours am: 7fe7416e -s ours

am skip reason: subject contains skip directive

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



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