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

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



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