Merge "Drive instrumentation with build flag" into main am: faeac4d7

Original change: https://android-review.googlesource.com/c/platform/build/+/3065622



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