Merge "Fix addrsig warnings" am: 9801f9d7 am: 1434efd5

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



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