Merge "Fix gsi_{arch} builds due to NOTICE.xml.gz" into main am: aec20ec3f8

Original change: https://android-review.googlesource.com/c/device/generic/common/+/3482011

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