[automerger skipped] Merge "Add system property for the new...

[automerger skipped] Merge "Add system property for the new boot-after-mainline-update compilation reason." am: 3f6ffaa3 am: 01a75657 am: ae5e48a3 -s ours

am skip reason: Merged-In I11d8d6eac1ea0e9537a839ee39adf3edb51852ec with SHA-1 8450989b is already in history

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



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