Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL...

Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into tm-dev am: 5dde2255 am: a5160284 am: 3a46099b

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



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