[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ad709f9d80 -s ours am: 57dfe7ec97 -s ours am: d53a288bbf -s ours am: 9404a71cbe -s ours

am skip reason: Change-Id I484ad3f0dee9c4ee7ffa9ef81256a30263dd8f1c with SHA-1 95439e8839 is in history

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

Change-Id: Icf496a0a956b55975de5ac38e46ca838a50e1abf
tree: 5fb4bf4c5aef4a63ffbf47da46e4e12bf6ab4233
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. NOTICE
  7. OWNERS