[automerger skipped] Merge "Update build_id.mk and version_defaults.mk for SC...

[automerger skipped] Merge "Update build_id.mk and version_defaults.mk for SC QPR1" into sc-qpr1-dev am: 2b595c26 -s ours

am skip reason: Merged-In Ie8bed4cefed83db5324ad98b6e70cb69b3f82780 with SHA-1 6487d1df is already in history

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

Change-Id: I43e19d61b2f5e7181bcb7f7406fe1fcb78b6474c