[automerger skipped] Merge "core/build_id.mk: this would become AOSP master so use AOSP.MASTER" into stage-aosp-master am: 26716e19 -s ours am: 84897f3f -s ours am: 20a35c6e -s ours

am skip reason: Merged-In I371275422da3fc1f5fe12b0bafba01af4e7fbca9 with SHA-1 11d1759b is already in history

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

Change-Id: I2805ab71bff098fbf67966a66e15316b7f08a7c1