Reland "Update instrumentation support for non-java debuggable runtimes" am: 322ef183e6

Original change: https://android-review.googlesource.com/c/platform/art/+/2185979

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