[automerger skipped] Add support for combining the notices from 2 roots. am:...

[automerger skipped] Add support for combining the notices from 2 roots. am: 74a6a0a3 am: 8ccced3e -s ours am: 98fca31f -s ours am: 267add87 -s ours

am skip reason: Change-Id Iea50b6bd9af9452a2600c97e2f7cb89218b9be7f with SHA-1 74a6a0a3 is in history

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

Change-Id: Ia7d46325834ffab4b95971a1397f8eca5b67f77b