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

am skip reason: Merged-In I28ea5b624aace842b601fc566e6935000781c2b4 with SHA-1 f337d471d3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/PartnerBookmarksProvider/+/27274279

Change-Id: I3ad0c759e889001b2e88bc16cd362f1a5056c326
Signed-off-by: Automerger Merge Worker <[email protected]>
tree: eec0c0e34aafe45c4fbac51a8424caaf770d3c52
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. proguard.flags