[automerger skipped] Merge "use @SystemAPI in PackageManager" am: 03b0291d1e am: df6aef083f am: 9623274a42
am: 266dd40dd1 -s ours
am skip reason: change_id Id00cf33233301d4cd4318ab27e6c828e528c3d72 with SHA1 0150f0ebd3 is in history

Change-Id: I439f324af495011bee318fb096084885d897d75e