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

Change-Id: Idb1f5f926ee30517ad84cde6958e495c15e4d1fd