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

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

Change-Id: Iafa45e2667543f97d1d880b27a7c41177feb1eb1