Merge \"Merge \\\\\"DO NOT MERGE ANYWHERE Fix NPE when UID has no...

Merge \"Merge \\\\\"DO NOT MERGE ANYWHERE Fix NPE when UID has no packages.\\\\\" into cw-e-dev am: eae242cf  -s ours am: 8b04b0db  -s ours am: 24d94b8a  -s ours am: 5d350d48  -s ours\" into nyc-mr1-dev-plus-aosp
am: 8e84fe4a  -s ours

Change-Id: Iee7c4b97d330c79c0f39a5d6714b850b58071e4b