[automerger skipped] Merge "Remove hiddenAPI.primary field" into sc-dev am:...

[automerger skipped] Merge "Remove hiddenAPI.primary field" into sc-dev am: 1c560ddd -s ours am: 04a05ccb -s ours

am skip reason: Merged-In If09796de710927e3e3f2ccecad0b57ca5fce5dc9 with SHA-1 45897dd6 is already in history

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

Change-Id: Ic9e8c84fb8fa9d81a9819305f2f39fb8035c20dd