Merge "use @SystemAPI in PackageManager"
am: 03b0291d1e

Change-Id: I13469fd19f29a5ccc2e15ab943f02d281c17ffe3