Merge "Add spdx-tools and licenseclassifier to soong mocks" am: 88c8d207 am:...

Merge "Add spdx-tools and licenseclassifier to soong mocks" am: 88c8d207 am: 3ec1c4af am: 85fd7a27

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



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