Merge "Sort expectTargets and actualTargets by name in bp2build test" am: 5c12bdfd

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



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