[automerger skipped] Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future am: bde45000 -s ours

am skip reason: Merged-In I69a3f8d2fd2d7dc157d14a0f743650881eec473d with SHA-1 dcc81d42 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/28718779



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