Merge "Merge "Maybe fix issue #62199092: Alarm didn't ring, upcoming alarm..." into oc-dev am: 8a95d49d am: a7853c75" into oc-dr1-dev-plus-aosp