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

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



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