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.

Change-Id: I6c74cf6762e8da10e09d5cf5d94e9f826e47f24d
Merge remote branch 'cm/cm-10.1'