Merge "Remove bg_non_interactive cgroup" am: c6c19bd6c0
am: 4ff81206e0

Change-Id: Ie79e352a5cf60af7f1bce8ae3563bf66ee1db134