Merge "Separating alarm history for lower quota" into sc-dev am: 977e2adc am: a0c063e0 am: 05133837

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

Change-Id: If467541873de19ed6c8c7bf280791f3f24eef399