[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 am: aa3cee98 -s ours am: 67c6ab3e -s ours

am skip reason: Change-Id Iea50b6bd9af9452a2600c97e2f7cb89218b9be7f with SHA-1 5e9e1fbe is in history

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

Change-Id: I3037b96d18f9a327c76b6ea146da978c80ddb9eb