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

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



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