Add complex query support for alarms

Change-Id: I3305d679d128562f7794a5cf460093981a601f7c
Add complex query support for alarm history

Change-Id: Ie41d9a0be73a525ae105262fb5859960bf9f9df6
Merge "Add complex query support for alarms"
Merge "Add complex query support for alarm history"