Merge "Remove unused combine-notice-files macro." am: 2f6aa08f am: 5324ea0c

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



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