[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: 1e076760e6 -s ours am: 27e23a3d50 -s ours

am skip reason: subject contains skip directive

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

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