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

am skip reason: Merged-In Idbe7a26d8d8543ce91826dec166b11c65c1b3148 with SHA-1 0e789f5f02 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/27274140

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