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

Change-Id: I5a4b6bb22a62ca8bff45ac81b116ae2fe7896613