Merge "Update JavaDoc for VectorDrawableCompat and related comments" into nyc-mr1-dev am: 1669254f95 am: c95c619a4f
am: 6886f5b86e

Change-Id: I21bf66ac2092ff22d4ab3ac4281113ddf91b46cc