Merge "Update deletion conditions for a package's UsageStats." into sc-dev am: 2a14be36ff

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222839

Change-Id: I4eabd7f3cafc5e95399e7265c56c937c04d5992d