[automerger skipped] Merge 24Q3 to AOSP main am: 2d4a9df871 -s ours am: c20674f1ac -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: I5d86d2f3bad50c756ba2c442025ed7e007d79a04
Signed-off-by: Automerger Merge Worker <[email protected]>