[automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could...

[automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into sc-dev am: 4eca7b30 am: e6bfe173 -s ours am: 50e469e8 -s ours am: c8640975 -s ours am: bcd857d4 -s ours

am skip reason: subject contains skip directive

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



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