Merge "Add support for optional cgroup attributes" am: c9b78e9528 am: 2b58071707 am: 68ec545a8e

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1962323

Change-Id: I8d9ef846c0350a0e119207097d171eb188c9b934