[automerger skipped] Merge "Update deletion conditions for a package's...

[automerger skipped] Merge "Update deletion conditions for a package's UsageStats." into sc-dev am: 2a14be36 am: e1a38189 -s ours am: 68ad7394 -s ours am: c80fb5f5 -s ours

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

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

Change-Id: Ie6baea80171ba5ad618727394263cd5d544db4bb