Merge "Use GID "wakelock" to control access to kernel wakelock" am: 0f0498ad50
am: 7705e0384e

* commit '7705e0384eb38b5a15168136cbeb5e9c3672011e':
  Use GID "wakelock" to control access to kernel wakelock