am 30434415: Merge "Dedupe timestamp in PackageSettings" into gingerbread

Merge commit '3043441511e4483d24dc6f42e1ee7f7e9dc71be2' into gingerbread-plus-aosp

* commit '3043441511e4483d24dc6f42e1ee7f7e9dc71be2':
  Dedupe timestamp in PackageSettings