Merge changes I04301fbd,If6577602 into nyc-dev
am: ac29617c6e

* commit 'ac29617c6e11085c9648d150a50c5daa15d65645':
  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: I28bae3d984af6d19852fb63eda5fb21c1b6c98dd