Merge "Merge "Fix typos in ClipData JavaDoc" into nyc-dev am: 77843a4213 am: 7315c27816" into nyc-mr1-dev-plus-aosp