[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 6e4ed2e600 -s ours

am skip reason: Merged-In I9cb155e852cab0965550cfb45815c89d96745e30 with SHA-1 26fc0b1ced is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/3258451

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