[automerger skipped] Merge "Handles null outInfo in deleteSystemPackageLI" am: b17f9ee38c am: 5b7c9a19d1 -s ours
am: 61d70ead7e -s ours
am skip reason: change_id If0fd48343e89cbb77ccd25826656194195d5b0cd with SHA1 5a3888c613 is in history

Change-Id: Ie56902e809df179dbaaded66e3c3de94c9483f09