Merge "Revert "init: Rename 'cgroups_activated' into 'fifo'"" am: 30bd9e95...

Merge "Revert "init: Rename 'cgroups_activated' into 'fifo'"" am: 30bd9e95 am: e213d234 am: 9a143190

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



Change-Id: I2c420bd188e677e1a5dae767e34ccc5af75c2ab2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>