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

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



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