[automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into tm-qpr-dev am: 43bb3bb36e am: fafec64b89 -s ours

am skip reason: subject contains skip directive

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

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