[automerger skipped] Revert^2 "Add variables for notice deps, license kinds...

[automerger skipped] Revert^2 "Add variables for notice deps, license kinds etc." am: 44dcaac2 -s ours am: e4219683 -s ours

am skip reason: Change-Id I6a60f55ab0e7013061a695cb1b7c5ffde29577dd with SHA-1 21bd34fe is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e2f3bc6bca75450126f3674accebc3407302e50