[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 1d054f309c -s ours

am skip reason: Merged-In I2f7619a401100fa6221aec9da7c2c665013cbb91 with SHA-1 9bc0c25ef0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/rs/+/27273330

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