[automerger skipped] Merge "Merge Android 12L" am: 662cb70889 -s ours am: 5796ab0c56 -s ours

am skip reason: Merged-In Icf2fc4009ea09a16967d96bf163ed295c1da94c3 with SHA-1 1d9343452b is already in history

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

Change-Id: I15ae78add1f428a256eb13d3588716334ba17226