[automerger skipped] Merge "use packageManager @SystemAPI" am: e958bbd8ae am: 206d891d07 am: f9c3973b11
am: 4427f74485 -s ours
am skip reason: change_id I1c0cb7840cb7d68fd720723eec96aa51aefc1df8 with SHA1 4b5f423c5c is in history

Change-Id: I092971554f5b038a2ef002f9b7b72654517a53ed