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

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

Change-Id: If0ff6b5e3691ceb887911d4e30a1e2ec26c081a9