Merge changes I04301fbd,If6577602 into nyc-dev am: ac29617c
am: 8b552ed0
* commit '8b552ed0':
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: I21935238c94a1f9922b5abb33eb78d447d94e499