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

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

Change-Id: Ib606a19a94cf8082239d5ac47c0ef78fead6ee91