Merge "Replace object tag with img tag in javadoc" am: db5da1ce28

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1733752

Change-Id: Ie27d970cb766bfd8291380585c1ab9ff0d6a665b