Merge "Update deletion conditions for a package's UsageStats." into rvc-dev am: 06c5973697

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

Change-Id: I8d86dd21a78900698780d3e0bd2fc82eb745ff23