DO NOT MERGE Fix PermissionManagerService throwing exception for unknown package. am: 03bb8eeeaa
am: 1b91bf22a2

Change-Id: Id599f489f0e94e78840cb82f951821db8f9a7e72