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

Change-Id: I2e82f03f15767296004acee2b04887888f849e6e