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

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

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



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