Merge "Add CAP_BLOCK_SUSPEND to system server" into klp-modular-dev