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

* commit '7315c2781626e3a0905e9b9d86297a9a6122ca5c':

Change-Id: I03e46a6a386ae0cac04020b94be274e5d6ed173d