Merge "Remove bg_non_interactive cgroup [ DO NOT MERGE ]" into nyc-mr2-dev am: 7e6dea0fab
am: 2e413a8ccf  -s ours

Change-Id: Icdcbd84f8af10ee177e1e1eb3c9210a8c3e4f79c