[automerger skipped] Merge "Update deletion conditions for a package's UsageStats." into rvc-dev am: 06c5973697 am: a7174fa6db -s ours am: 5cae04a584 -s ours am: 1e42dfc825 -s ours am: 8522b80b83 -s ours
am skip reason: Merged-In I94a8e3dfca8ef4c7616f77944d61726e06043b85 with SHA-1 d95ce6779d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16244186
Change-Id: Ia3691d7823886ec34b7dbc8a313ce8bc7cb0633a
This commit is contained in: