[automerger skipped] Merge "Rename soong outdir to generated-headers" am: 30bf9e8463 am: 290034ac6b -s ours am: a0d2099f8c -s ours

am skip reason: Merged-In I3da7ee98f53e460c448c05ad3456022888099888 with SHA-1 6547080f72 is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/1850393

Change-Id: Icfb230aafd6dbec206487b5265be1699a58ceff9