Remove extra checks for content protection policy, add to lists

Bug: 321718961
Test: N/A
Change-Id: Ia9e25d900422cf0d85dd1de48458a24b691886fb
1 file changed