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

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

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

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

Change-Id: Ifa9aecd87a685acdfbdc1b46dc2588491f07b9f9