[automerger skipped] Merge "Notice files and non-module targets." am:...

[automerger skipped] Merge "Notice files and non-module targets." am: dd780ca8 am: a9e626d7 am: 09e836dd -s ours am: f8668916 -s ours

am skip reason: Merged-In Icdb11d3c72b180cd02231e8dc98ae500d6566a98 with SHA-1 ebdefc0c is already in history

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

Change-Id: I6518bbda97c8474335c14c4ff79e1278e2f323d2