Merge "Add test for bazel server shutdown/restart" am: 3d3c7ee1 am: 1ad1d38e am: 1c8e8fbe

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



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