Merge "Use GID "wakelock" to control access to kernel wakelock" am: 60d142c54b
am: 91fc6d1f9c

* commit '91fc6d1f9cd5e83eec5753ef92960d03367c33a6':
  Use GID "wakelock" to control access to kernel wakelock