[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: a7174fa6 -s ours am: 5cae04a5 -s ours am: 1e42dfc8 -s ours am: 8522b80b -s ours

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

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

Change-Id: Ia3691d7823886ec34b7dbc8a313ce8bc7cb0633a