[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-dev am: 4eca7b30 am: e6bfe173 -s ours am: 50e469e8 -s ours am: c8640975 -s ours am: 1a7f933b -s ours am: 8442f15b -s ours

am skip reason: subject contains skip directive

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



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