[automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into qt-dev am: 8274886238 am: 72967ce869 -s ours am: f90ec68dfa -s ours am: 07010d6514 -s ours am: 31fc4ee296 -s ours am: 5e63482a03 -s ours am: b5c2e44c87 -s ours am: d6196227be -s ours am: bc1e9b467e -s ours

am skip reason: subject contains skip directive

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

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