Merge "DO NOT MERGE Fix PermissionManagerService throwing exception for unknown package. am: 03bb8eeeaa am: f0c48cec19" into qt-qpr1-dev-plus-aosp