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

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