Merge changes I04301fbd,If6577602 into nyc-dev am: ac29617c am: 4240daca
am: adf2a624
* commit 'adf2a624':
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: I489a00519a7484886f946c8d640dfa3fcb6bf3a7