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

Merge "Separating alarm history for lower quota" into sc-dev am: 977e2adc am: 4a1133c8 am: 1de26693

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

Change-Id: I84c68b1027004890df81162a39fd66ab8a37865e