Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into tm-dev am: 5dde225528 am: a516028455 am: 3a46099b32
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>
This commit is contained in: