[automerger skipped] Merge "Update deletion conditions for a package's UsageStats." into sc-dev am: 2a14be36ff am: 837f58f7fa am: 41e23753cc am: 0912451704 -s ours

am skip reason: Merged-In I94a8e3dfca8ef4c7616f77944d61726e06043b85 with SHA-1 157fbcfbe4 is already in history

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

Change-Id: I514b987246eb73aada3b44ece0ee07457fb9d5f5