Merge "sepolicy for vendor cgroups.json and task_profiles.json files" am: e3f15e2abc
am: b582791324

Change-Id: If22de5b815455ce745e4f285b76bba661383004f