[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 I39a82c8ac3fd0b43bad06ec47b85aaeda6ef5cb4 with SHA-1 cc2f12f1 is already in history

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

Change-Id: Ic2732a4b6152adb47ff565496416239b8781cafe