Also fixed code that checks for whitelist uids, otherwise it would pass when the required uid is missing but a superset was present (for example, when asking for 1009 but 10090 was whitelisted). BUG: 28431507 Change-Id: Iaaa67e586907dba215496460445ad627ba7b63c5