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