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

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

Change-Id: Id922cfe948bea5404f5feffbf90c8fe0c6c74502