Merge "Refactor and cleanup of bazel handler" am: bcbb1728

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



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