[automerger skipped] Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future am: b4e9230a1e -s ours

am skip reason: Merged-In I8e993e1ab9ec413134b6a2c75484e1e890862213 with SHA-1 8d7bc4f078 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/tools/sysprop/+/27144876

Change-Id: I67dc863b3cb7043e687827116fdaeb05f52a0be0
Signed-off-by: Automerger Merge Worker <[email protected]>