remove privacyguard patches that were brought in from cm

Change-Id: Iacb935459644d3a3d48dbcbce5003cc09c96e61d