[automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-qpr-dev am: 95907cfca2 -s ours am: d577c51c3d -s ours am: f684abcd18 -s ours am: 64da92499e -s ours am: e166e03ed3 -s ours am: d094458104 -s ours

am skip reason: subject contains skip directive

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

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