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

Change-Id: I41e0a19b59c01746da4a229234f66e109e1f5102