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

Change-Id: I45ad320c81e9a559e4b0906f8463a7ee27086453