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: Ic05768dc4213e00f93829ace282fd847dc2e5fed