[automerger skipped] Merge Android 12L am: 0d2c20b553 -s ours am: 2cfda3f768 -s ours am: b3f25632c6 -s ours am: beeb7f334e -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: Id658ca300f6dd4364449b43be74788ee3b5e6095