Merge "Merge "Resume throwing if too many concurrent alarms" into qt-dev am:...
Merge "Merge "Resume throwing if too many concurrent alarms" into qt-dev am: 168f5980" into qt-dev-plus-aosp
am: 02f98c70
Change-Id: Iba7fcb867e87fc66722c653c351ae94c2a546cdf