Merge "SECURITY FIX: Fix package uids being reused between uninstall and...

Merge "SECURITY FIX: Fix package uids being reused between uninstall and reinstall of different packages. Policies for older packages were being granted to the newly installed package that got the recyled uid." into cm-11.0