Merge "Transfer ownership of HTMLViewer app." am: 8b19c43944 am: 0d6aa27c18 am: 4669207d50 am: b4fceff66c

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

Change-Id: I1d17159ff18a987343c721b3ce61033454df21e1