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: c1ec9abe
* commit 'c1ec9abe':
Change-Id: Icffcdb8043891c57dbd496c8942899324e270e38