[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 5fdafc0259 -s ours am: b526bf3f0b -s ours am: 358ff56c90 -s ours am: 7ecf7b76db -s ours

am skip reason: Merged-In I2297b003c61c2e781b277d0ccfb7e9b715635978 with SHA-1 fc77ac29e2 is already in history

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

Change-Id: I302c63b82be2d13741e8d1a9faf073bfad51ed0b