DO NOT MERGE ANYWHERE Fix NPE when UID has no packages.

CP of 377ded0fce449f77cd7efae35f97722cdab52693

BUG: 25224723
BUG: 28815187
Change-Id: I248468f0d9ccd6aef36b2076bf7f90efb833efd2
2 files changed