[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: ecde83a0b4 -s ours am: 5d367f2880 -s ours

am skip reason: Change-Id I46de99eddcff6f2866919a6d807236b6bd80416c with SHA-1 d53a288bbf is in history

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

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