[automerger skipped] Merge "Enforce the legacy core/platform API restriction."...

[automerger skipped] Merge "Enforce the legacy core/platform API restriction." am: 4ab239ec am: 25b45039 -s ours

am skip reason: Change-Id Iaa97ddaa015e8079fcb3426585c5101c7ec9e22a with SHA-1 e64cf6e0 is in history

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

Change-Id: Icab8229d74f3810b4fb118b76cc0076fb4458f9c