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

[automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into tm-dev am: 5dde2255 am: aa2736e3 -s ours

am skip reason: subject contains skip directive

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



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