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

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

Change-Id: I414aad5225cb7d577109eab4bda9aebd78ec1acd