Merge "Re-call BUILD_NOTICE_FILE for modules that add deps" am: 08472a6b4b am: 98fd5d25d7 am: 0adcb0c7f6

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

Change-Id: I40c534e102b887323c8df82198465189ae94dec7