Merge "Use GID "wakelock" to control access to kernel wakelock"
am: 4227127ec6

* commit '4227127ec66719397100d9700283d40e93560881':
  Use GID "wakelock" to control access to kernel wakelock