[automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 0b75cda3c2 -s ours am: 7fe7416e79 -s ours am: a41bf91d53 -s ours am: c22b698208 -s ours

am skip reason: subject contains skip directive

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

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