Merge changes I04301fbd,If6577602 into nyc-dev

* changes:
  Flesh out the docs for the android.os.health package.
  Properly blame the correct uid for wakeup alarms that don't have a WorkSource.