[automerger skipped] Merge "Update deletion conditions for a package's UsageStats." into rvc-dev am: 06c5973697 am: 68431cf82f -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/+/16222704

Change-Id: Id1c78a33e62ea64ff5391a09ba3dd54dac8598fc