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

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



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