Merge changes I04301fbd,If6577602 into nyc-dev am: ac29617c
am: 4240daca
* commit '4240daca':
Flesh out the docs for the android.os.health package.
Properly blame the correct uid for wakeup alarms that don't have a WorkSource.
Change-Id: I773937e0b0a5c1021e1c0716e06ec29f6f78a351