[automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into sc-dev am: 4eca7b30b8 am: e6bfe173ca -s ours am: 50e469e8ff -s ours am: c8640975fb -s ours am: 1a7f933b02 -s ours am: 8442f15b5e -s ours am: c44e0d67b0 -s ours

am skip reason: subject contains skip directive

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

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