[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 sc-v2-dev am: a268a990 -s ours am: f5763f34 -s ours am: 10f46e19 -s ours am: e53db3cf -s ours

am skip reason: subject contains skip directive

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



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