Merge "Include correct type of SELinux policy" am: 0ab93fdf3a
am: 18a826024b

Change-Id: I1f6da6ef96992bd46dde751da92a4e4063616758