[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 1d9343452b -s ours am: 5dc8b84573 -s ours

am skip reason: Merged-In I9de578d61bc7f9c250bad81079bcb9981b8c980e with SHA-1 1c014ca0ba is already in history

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

Change-Id: I1bf067f5a62b3a643105fe22d74b52ce2aab5375