[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-qpr-dev am: 43bb3bb3 am: fafec64b -s ours

am skip reason: subject contains skip directive

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



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