Merge "DO NOT MERGE Fix PermissionManagerService throwing exception for unknown package." into qt-r1-dev am: 40921e6c7e
am: 0c79aa29aa

Change-Id: I359ff56d468cab2edbf3a8f1faca3e01be1c87a0