Merge "Clean up history files via job vs multiple alarms" into tm-qpr-dev am:...

Merge "Clean up history files via job vs multiple alarms" into tm-qpr-dev am: f552a187 am: d1c19c2b

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



Change-Id: I76fc5e15bcb0e1773e8b7a27af3ec2b41250ee69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>