[automerger skipped] Merge "RESTRICT AUTOMERGE Update Build ID for APK-in-APEX...

[automerger skipped] Merge "RESTRICT AUTOMERGE Update Build ID for APK-in-APEX fix for July" into sc-mainline-prod am: 4da50cef -s ours am: 96a5be9a -s ours am: e594d478 -s ours

am skip reason: subject contains skip directive

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



Change-Id: I4bc2c1bc01c763eb1108f400ba6dcc01ccffbde6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>