am 7d50596a: am 6835033a: am c6f0b54d: Merge "Add CAP_BLOCK_SUSPEND to system server" into klp-modular-dev

* commit '7d50596a9c27b6db6468009ad196707e08f88bd6':
  Add CAP_BLOCK_SUSPEND to system server