am d9ff894e: am 05f56fc1: am 95867a65: Merge "Add PowerManager method to assign blame to a single uid" into klp-dev

* commit 'd9ff894eae0b3acd3c89585a80ebd2039ed1de8c':
  Add PowerManager method to assign blame to a single uid