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

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

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