Merge "Update owners for HTML viewer" into android11-release