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

Change-Id: I50d765b92ee2f717eb5864393802d0bea1476504