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

[automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 2d20bee7 am: 0c4ae957 -s ours am: b899c833 -s ours

am skip reason: subject contains skip directive

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



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