Merge "Merge "Fix a couple bad links in the javadoc for android.os.health."...
Merge "Merge "Fix a couple bad links in the javadoc for android.os.health." into nyc-dev am: 3b25fd08 am: 0ee1a7e8" into nyc-mr1-dev-plus-aosp
am: 59f171c9
* commit '59f171c9':
Change-Id: If4fd3fd017acf743a22547e975e79217b1b408df