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

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



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