[automerger skipped] Combine hidden API encoding with flag generation am:...

[automerger skipped] Combine hidden API encoding with flag generation am: c75bbcec am: 6eb77d30 -s ours

am skip reason: Merged-In I60996a34d06ed1c87ed244ab3509621999ad86ec with SHA-1 e521881b is already in history

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

Change-Id: Ie9403073f9e1a29dcd4ec2dfbef2dc7be76455b1