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

Change-Id: Ic099e716790915700062ed2dc64ef5bd780579c7