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

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

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