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

Change-Id: If655104c7fcf319155bae82d0a3a2310f119a455