Merge "Cleans up userId loop in clearPackageStateForUser" into qt-dev
am: 662eb71dd0

Change-Id: Iecc269b7b3c031606cf8742746152bce0923a633