[automerger skipped] Merge "Merge Android 12" am: ec4ac92fde -s ours am: df3498585b -s ours

am skip reason: Merged-In I5fcea49e0ecab3433a0e369a44d42569ac5d40ae with SHA-1 5fdafc0259 is already in history

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

Change-Id: I14382736cb8f6aa96fdc1b70abfbc817e656335e