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

Change-Id: Ia9a577a93ae9714e7d4a5048fa509c34c7faa13f