Merge "Salt the package hash code using the device serial Bug: 62676166" into ub-launcher3-dorval-polish
am: 6f7f4bb97e

Change-Id: If62bc555e4ae607977b40c1c1d22d62b53455e97