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

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

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